Repository: incubator-atlas Updated Branches: refs/heads/master 7403ebff1 -> 727b27fbd
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/fonts/glyphicons-halflings-regular.woff ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/fonts/glyphicons-halflings-regular.woff b/dashboardv2/public/css/fonts/glyphicons-halflings-regular.woff deleted file mode 100644 index 9e61285..0000000 Binary files a/dashboardv2/public/css/fonts/glyphicons-halflings-regular.woff and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/fonts/glyphicons-halflings-regular.woff2 ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/fonts/glyphicons-halflings-regular.woff2 b/dashboardv2/public/css/fonts/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b5..0000000 Binary files a/dashboardv2/public/css/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/breadcrumb.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/breadcrumb.scss b/dashboardv2/public/css/scss/breadcrumb.scss index eaa89e7..cf3324e 100644 --- a/dashboardv2/public/css/scss/breadcrumb.scss +++ b/dashboardv2/public/css/scss/breadcrumb.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* breadcrumb.scss */ .breadcrumb { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/business-catlog.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/business-catlog.scss b/dashboardv2/public/css/scss/business-catlog.scss index 824bf10..8e68fc1 100644 --- a/dashboardv2/public/css/scss/business-catlog.scss +++ b/dashboardv2/public/css/scss/business-catlog.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* business-catlog.scss */ .main-search { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/form.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/form.scss b/dashboardv2/public/css/scss/form.scss index 82bd960..6802c12 100644 --- a/dashboardv2/public/css/scss/form.scss +++ b/dashboardv2/public/css/scss/form.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* form.scss */ .form-control { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/graph.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/graph.scss b/dashboardv2/public/css/scss/graph.scss index 7c6571c..7395daf 100644 --- a/dashboardv2/public/css/scss/graph.scss +++ b/dashboardv2/public/css/scss/graph.scss @@ -1,5 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* graph.scss */ + /* .graph-bg svg { background-image: linear-gradient(to right, $black -10px, rgba(0, 0, 0, 0) 1px), linear-gradient($black -10px, $color_cararra_approx 1px); background-size: 10px 10px; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/loader.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/loader.scss b/dashboardv2/public/css/scss/loader.scss index 6c255c6..080283a 100644 --- a/dashboardv2/public/css/scss/loader.scss +++ b/dashboardv2/public/css/scss/loader.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* loader.scss */ .fa-spin-custom { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/login.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/login.scss b/dashboardv2/public/css/scss/login.scss index c7237cc..f0b8e74 100644 --- a/dashboardv2/public/css/scss/login.scss +++ b/dashboardv2/public/css/scss/login.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* login.scss */ //colors @@ -12,10 +31,12 @@ box-shadow: 4px 3px 8px -2px $gray; } } + .close { padding: 6px; font-size: 15px; } + .login-pane { margin-top: 50px; margin-top: 35%; @@ -61,11 +82,12 @@ transition: all .3s ease; } } + button:focus { outline: none !important; } + .form-control:focus { //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) box-shadow: none; } - http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/main.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/main.scss b/dashboardv2/public/css/scss/main.scss index e9fb452..6b88639 100644 --- a/dashboardv2/public/css/scss/main.scss +++ b/dashboardv2/public/css/scss/main.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* main.scss */ //common color http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/nav.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/nav.scss b/dashboardv2/public/css/scss/nav.scss index 7277ae1..524e2b8 100644 --- a/dashboardv2/public/css/scss/nav.scss +++ b/dashboardv2/public/css/scss/nav.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* nav.scss */ .navbar-atlas { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/old-style.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/old-style.scss b/dashboardv2/public/css/scss/old-style.scss index f62c494..89e313e 100644 --- a/dashboardv2/public/css/scss/old-style.scss +++ b/dashboardv2/public/css/scss/old-style.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* old-style.scss */ //@extend-elements http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/override.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/override.scss b/dashboardv2/public/css/scss/override.scss index 6fc1e1f..743728a 100644 --- a/dashboardv2/public/css/scss/override.scss +++ b/dashboardv2/public/css/scss/override.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* override.scss */ .tabs li.tab.active { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/panel.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/panel.scss b/dashboardv2/public/css/scss/panel.scss index ee85715..8f345e8 100644 --- a/dashboardv2/public/css/scss/panel.scss +++ b/dashboardv2/public/css/scss/panel.scss @@ -1,4 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* panel.scss */ + .panel { //Instead of the line below you could use @include border-radius($radius, $vertical-radius) border-radius: 0; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/search.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/search.scss b/dashboardv2/public/css/scss/search.scss index 858b974..e42224e 100644 --- a/dashboardv2/public/css/scss/search.scss +++ b/dashboardv2/public/css/scss/search.scss @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + //colors $color_celeste_approx: #1D1F2B; .switch { @@ -67,6 +85,7 @@ input { .advanceSearchTermInput { margin-bottom: 20px; } + .clearAdvanceSearch { display: inline-block; float: left; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/tab.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/tab.scss b/dashboardv2/public/css/scss/tab.scss index 5117efe..ada0bdf 100644 --- a/dashboardv2/public/css/scss/tab.scss +++ b/dashboardv2/public/css/scss/tab.scss @@ -1,4 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* tab.scss */ + .atlast-tabbable { margin: 50px 0; .nav-tabs { @@ -83,8 +103,8 @@ ul.tabs li.tab { height: 100%; //Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10) transition: color 0.28s ease; - /* color: $color_manatee_approx; */ - /* &:hover { + /* color: $color_manatee_approx; */ + /* &:hover { color: $color_keppel_approx; } &.active { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/tag.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/tag.scss b/dashboardv2/public/css/scss/tag.scss index 1a07ce2..8eb0ac2 100644 --- a/dashboardv2/public/css/scss/tag.scss +++ b/dashboardv2/public/css/scss/tag.scss @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + //tag.scss .tag-tree { padding: 0; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/theme.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/theme.scss b/dashboardv2/public/css/scss/theme.scss index b05f7a2..2577cfc 100644 --- a/dashboardv2/public/css/scss/theme.scss +++ b/dashboardv2/public/css/scss/theme.scss @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + /* theme.scss */ .user-dropdown { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/css/scss/tree.scss ---------------------------------------------------------------------- diff --git a/dashboardv2/public/css/scss/tree.scss b/dashboardv2/public/css/scss/tree.scss index e6c8ebf..5574137 100644 --- a/dashboardv2/public/css/scss/tree.scss +++ b/dashboardv2/public/css/scss/tree.scss @@ -1,176 +1,197 @@ - /* tree.scss */ - - .jstree-container-ul { - padding-left: 0px; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +/* tree.scss */ + +.jstree-container-ul { + padding-left: 0px; + position: relative; + list-style: none; + .jstree-node { + white-space: nowrap; position: relative; - list-style: none; - .jstree-node { - white-space: nowrap; - position: relative; - cursor: pointer; - padding: 4px 0; - margin: 0; - margin-top: 5px; - margin-bottom: 5px; - } - ul { - list-style: none; - padding: 0; - text-indent: 30px; - } - li a { - // color: $white; - display: block; - } + cursor: pointer; + padding: 4px 0; + margin: 0; + margin-top: 5px; + margin-bottom: 5px; } - - .taxonomyTree { + ul { + list-style: none; padding: 0; + text-indent: 30px; + } + li a { + // color: $white; + display: block; + } +} + +.taxonomyTree { + padding: 0; + position: relative; + li { position: relative; - li { - position: relative; - border-radius: 4px; - margin-top: 5px; - &.parent { - width: 100%; - a { - max-width: 93%; - } + border-radius: 4px; + margin-top: 5px; + &.parent { + width: 100%; + a { + max-width: 93%; } - &.parentChild { - ul { - padding-left: 9%; - } - li { - &.children { - width: 91%; - } - a { - max-width: 90%; - } - } + } + &.parentChild { + ul { + padding-left: 9%; } - &.children { - &:hover { - background-color: $color_star_dust_approx; + li { + &.children { + width: 91%; } - } - &.active { - background-color: $color_jungle_green_approx !important; - border: none; - .tools { - display: block; - .fa { - cursor: pointer; - padding: 0px 3px; - } + a { + max-width: 90%; } } - a { - display: block; - color: $concrete; - white-space: nowrap; - padding: 5px 25px; - text-overflow: ellipsis; - overflow: hidden; - cursor: pointer; + } + &.children { + &:hover { + background-color: $color_star_dust_approx; } + } + &.active { + background-color: $color_jungle_green_approx !important; + border: none; .tools { - background: $color_jungle_green_approx; - display: none; - position: absolute; - right: 2px; - padding: 5px; + display: block; + .fa { + cursor: pointer; + padding: 0px 3px; + } } } - } - - .termPopoverList { - color: #666; - padding: 0px 5px; - margin-bottom: 0px; a { - color: #666; - padding: 5px; + display: block; + color: $concrete; + white-space: nowrap; + padding: 5px 25px; + text-overflow: ellipsis; + overflow: hidden; + cursor: pointer; } - } - - .termPopover { - cursor: pointer; - } - - .termMoveDiv { - width: 550px; - height: 200px; - margin: 10px; - } - - .tagPopoverList { - color: #666; - padding: 0px 5px; - margin-bottom: 0px; - a { - color: #666; + .tools { + background: $color_jungle_green_approx; + display: none; + position: absolute; + right: 2px; padding: 5px; } } - - .toggleArrow { - position: absolute; - left: 0px; - padding: 8px; - cursor: pointer; +} + +.termPopoverList { + color: #666; + padding: 0px 5px; + margin-bottom: 0px; + a { + color: #666; + padding: 5px; } - - .addTermDiable { - border-color: #FF0000 !important; +} + +.termPopover { + cursor: pointer; +} + +.termMoveDiv { + width: 550px; + height: 200px; + margin: 10px; +} + +.tagPopoverList { + color: #666; + padding: 0px 5px; + margin-bottom: 0px; + a { + color: #666; + padding: 5px; } - - .alertTerm { - color: #FF0000 !important; +} + +.toggleArrow { + position: absolute; + left: 0px; + padding: 8px; + cursor: pointer; +} + +.addTermDiable { + border-color: #FF0000 !important; +} + +.alertTerm { + color: #FF0000 !important; +} + + +/**Css changes**/ + +.modal-body { + .add-seperator { + border: none; } - /**Css changes**/ - - .modal-body { - .add-seperator { - border: none; + .taxonomyTree li { + .children { + text-indent: 20px; } - .taxonomyTree li { - .children { - text-indent: 20px; + &.parentChild { + ul { + padding-left: 0px; } - &.parentChild { - ul { - padding-left: 0px; - } - li { - &.children { - width: 100%; - } - a { - max-width: 100%; - } + li { + &.children { + width: 100%; } - } - &.active { - color: $concrete; a { - color: $concrete; + max-width: 100%; } } + } + &.active { + color: $concrete; a { - color: #6C6C6C; - } - &.children:hover { - a { - color: $concrete; - } - background-color: #ABABAB; - color: $white; + color: $concrete; } - .tools { - text-indent: 0px; - background: none; + } + a { + color: #6C6C6C; + } + &.children:hover { + a { + color: $concrete; } + background-color: #ABABAB; + color: $white; + } + .tools { + text-indent: 0px; + background: none; } } +} http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/index.html ---------------------------------------------------------------------- diff --git a/dashboardv2/public/index.html b/dashboardv2/public/index.html index 59e2c7e..c43ca9a 100644 --- a/dashboardv2/public/index.html +++ b/dashboardv2/public/index.html @@ -42,7 +42,7 @@ <link rel="stylesheet" href="js/libs/jquery-asBreadcrumbs/css/asBreadcrumbs.css"> <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'> <link href="css/bootstrap-sidebar.css" rel="stylesheet"> - <link href="css/font-awesome.min.css" rel="stylesheet"> + <link href="js/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet"> <link href="css/style.css" rel="stylesheet"> </head> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/js/main.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/main.js b/dashboardv2/public/js/main.js index 95f64a1..ceed10c 100644 --- a/dashboardv2/public/js/main.js +++ b/dashboardv2/public/js/main.js @@ -97,9 +97,6 @@ require.config({ dagreD3: { deps: ['d3'], exports: 'dagreD3' - }, - tree: { - deps: ['jquery'] } }, @@ -128,7 +125,6 @@ require.config({ 'hbs': 'require-handlebars-plugin/js/hbs', 'i18nprecompile': 'require-handlebars-plugin/js/i18nprecompile', 'dagreD3': 'libs/dagre-d3/dagre-d3.min', - 'tree': 'libs/jstree/jstree.min', 'select2': 'libs/select2/select2.min', 'backgrid-select-all': 'libs/backgrid-select-all/backgrid-select-all.min' }, http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/js/modules/atlasLogin.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/modules/atlasLogin.js b/dashboardv2/public/js/modules/atlasLogin.js index 5ed2fb7..0fec3e4 100644 --- a/dashboardv2/public/js/modules/atlasLogin.js +++ b/dashboardv2/public/js/modules/atlasLogin.js @@ -1,4 +1,4 @@ -/* +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -6,18 +6,17 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - + //Define indexOf for IE if (!Array.indexOf) { Array.prototype.indexOf = function(obj, start) { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/js/views/business_catalog/MoveTermLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/business_catalog/MoveTermLayoutView.js b/dashboardv2/public/js/views/business_catalog/MoveTermLayoutView.js index 3add56a..aa0d717 100644 --- a/dashboardv2/public/js/views/business_catalog/MoveTermLayoutView.js +++ b/dashboardv2/public/js/views/business_catalog/MoveTermLayoutView.js @@ -19,13 +19,12 @@ define(['require', 'backbone', 'hbs!tmpl/business_catalog/MoveTermLayoutView_tmpl', - 'utils/Utils', - 'tree' + 'utils/Utils' ], function(require, Backbone, MoveTermLayoutViewTmpl, Utils) { 'use strict'; var MoveTermLayoutView = Backbone.Marionette.LayoutView.extend( - /** @lends BusinessCatalogLayoutView */ + /** @lends MoveTermLayoutView */ { _viewName: 'MoveTermLayoutView', @@ -42,34 +41,14 @@ define(['require', return events; }, /** - * intialize a new BusinessCatalogLayoutView Layout + * intialize a new MoveTermLayoutView Layout * @constructs */ initialize: function(options) { _.extend(this, _.pick(options, 'taxanomyCollection')); - // $('#using_json_2').jstree({ - - // }); }, bindEvents: function() {}, - onRender: function() { - this.taxanomyCollectionList(); - }, - taxanomyCollectionList: function() { - // var data = []; - // _.each(this.taxanomyCollection.models, function(val, obj) { - // var obj = {}; - // obj['text'] = val.get('name'); - // //obj['a_attr'] = { 'href': '#!/detailPage/' + val.get('$id$').id } - // obj['children'] = []; - // data.push(obj) - // }); - // this.$('#tree').jstree({ - // 'core': { - // 'data': data - // } - // }); - } + onRender: function() {} }); return MoveTermLayoutView; }); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/dashboardv2/public/js/views/search/SearchLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js b/dashboardv2/public/js/views/search/SearchLayoutView.js index 083e515..730c451 100644 --- a/dashboardv2/public/js/views/search/SearchLayoutView.js +++ b/dashboardv2/public/js/views/search/SearchLayoutView.js @@ -21,8 +21,7 @@ define(['require', 'hbs!tmpl/search/SearchLayoutView_tmpl', 'collection/VSearchList', 'utils/Utils', - 'collection/VTagList', - 'tree', + 'collection/VTagList' ], function(require, Backbone, SearchLayoutViewTmpl, VSearchList, Utils, VTagList) { 'use strict'; @@ -42,7 +41,6 @@ define(['require', searchInput: '[data-id="searchInput"]', searchType: 'input[name="queryType"]', advanceSearch: '[data-id="advanceSearch"]', - //advanceSearchContainer: '[data-id="advanceSearchContainer"]', tagList: '[data-id="tagList"]', tagListInput: '[data-id="tagListInput"]', termListInput: '[data-id="termListInput"]', @@ -91,18 +89,11 @@ define(['require', this.listenTo(this.searchCollection, "reset", function(value) { this.renderTree(); }, this); - // this.listenTo(this.tagCollection, 'reset', function() { - // this.tagsAndTypeGenerator('tagCollection', this.ui.tagListInput, 'listTag', param); - // }, this); - // this.listenTo(this.typeCollection, 'reset', function() { - // this.tagsAndTypeGenerator('typeCollection', this.ui.termListInput, 'listType', param); - // }, this); }, onRender: function() { // array of tags which is coming from url this.ui.searchBtn.attr("disabled", "true"); this.setValues(); - this.fetchCollections(); }, manualRender: function(paramObj) { this.setValues(paramObj); @@ -117,18 +108,6 @@ define(['require', // get only search value and append it to input box this.ui.searchInput.val(this.value.query); this.ui.searchBtn.removeAttr("disabled"); - /* if (this.value.query.split(" where ").length > 1) { - this.ui.searchInput.val(this.value.query.split(" where ")[0]); - } else if (this.value.query.split(" isa ").length > 1) { - this.ui.searchInput.val(this.value.query.split(" isa ")[0]); - } else { - this.ui.searchInput.val(this.value.query); - } - _.each(this.value.query.split(' isa '), function(val, key) { - if (key > 0) { - arr.push(val.split(" ")[0]) - } - });*/ } if (this.value.dslChecked == "true") { this.ui.searchType.prop("checked", true).trigger("change"); @@ -138,23 +117,11 @@ define(['require', } this.bindEvents(arr); }, - fetchCollections: function() { - // this.tagCollection.fetch({ reset: true }); - // this.typeCollection.fetch({ reset: true }); - }, findSearchResult: function() { this.triggerSearch(this.ui.searchInput.val()); }, triggerSearch: function(value) { - // this.ui.searchType.is(':checked') == true; - // var advancedSearchValue = value; if (!this.ui.searchType.is(':checked')) { - // if (this.ui.tagListInput.select2('data').length > 1) { - // advancedSearchValue = value + " where " + value + " isa " + this.ui.tagListInput.val().join(" and " + value + " isa "); - // } else { - // advancedSearchValue = value + " isa " + this.ui.tagListInput.val(); - // advancedSearchValue = value; - // } this.type = "dsl"; } else if (!this.ui.searchType.is(':checked')) { this.type = "fulltext"; @@ -183,37 +150,11 @@ define(['require', } this.searchCollection.fetch({ reset: true }); }, - // tagsAndTypeGenerator: function(collection, element, searchString, params) { - // var str = ''; - // _.each(this[collection].fullCollection.models, function(model) { - // var tagName = model.get("tags"); - // if (searchString) { - // str += '<option data-id="tags">' + tagName + '</option>'; - // } - // }); - // element.html(str); - // if (searchString == 'listTag') { - // var placeholderText = "Containing tag(S)"; - // if (params) { - // element.val(params); - // } - // } else { - // var placeholderText = "Select type"; - // } - // element.select2({ - // placeholder: placeholderText, - // allowClear: true - // }); - // }, dslFulltextToggle: function(e) { if (e.currentTarget.checked) { this.type = "dsl"; - //this.dslSearch = true; - //this.ui.advanceSearchContainer.hide(); } else { this.type = "fulltext"; - // this.dslSearch = false; - //this.ui.advanceSearchContainer.show(); } if (this.ui.searchInput.val() !== "") { Utils.setUrl({ @@ -235,8 +176,6 @@ define(['require', }, clearSearchData: function() { this.ui.searchInput.val(""); - //this.ui.tagListInput.select2('val', ''); - //this.ui.termListInput.select2('val', ''); this.ui.searchBtn.attr("disabled", "true"); Utils.setUrl({ url: '#!/search', http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4e7d4fd..8634626 100755 --- a/pom.xml +++ b/pom.xml @@ -1695,11 +1695,9 @@ <exclude>dev-support/**</exclude> <exclude>**/users-credentials.properties</exclude> <exclude>**/public/css/animate.min.css</exclude> - <exclude>**/public/css/fonts/**</exclude> - <exclude>**/public/css/font-awesome.min.css</exclude> + <exclude>**/public/css/bootstrap-sidebar.css</exclude> <exclude>**/public/js/require-handlebars-plugin/**</exclude> <exclude>**/node_modules/**</exclude> - <exclude>**/public/css/scss/**</exclude> <!-- All the npm plugins are copied here, so exclude it --> <exclude>**/public/js/libs/**</exclude> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/95f4f2f0/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index fde9eec..722bd3e 100644 --- a/release-log.txt +++ b/release-log.txt @@ -35,6 +35,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-958 Add licenses for dashboard dependencies (kevalbhatt18 via shwethags) ATLAS-474 Server does not start if the type is updated with same super type class information (dkantor via shwethags) ATLAS-621 Introduce entity state in Id object (shwethags) ATLAS-619 Canonicalize hive queries (sumasai)
