Merge branch 'master' into master

GeoNode · Jan 7, 2020 · f9cb058 · f9cb058
2 parents 250fc6a + 4a389a1
commit f9cb058
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 13 deletions.
diff --git a/geonode/static/geonode/css/base.css b/geonode/static/geonode/css/base.css
@@ -7370,11 +7370,10 @@ article.tab-pane {
   cursor: pointer;
   word-break: break-all;
   padding-left: 0px;
-  padding-left: 35px;
+  padding-left: 12px;
 }
 .treeview span.icon {
   margin-right: 5px;
-  margin-left: -18px;
 }
 span.icon.node-icon:before {
   font-family: FontAwesome;

diff --git a/geonode/static/geonode/less/base.less b/geonode/static/geonode/less/base.less
@@ -681,12 +681,11 @@ article.tab-pane {
     cursor: pointer;
     word-break: break-all;
     padding-left: 0px;
-    padding-left: 35px;
+    padding-left: 12px;
 }
 
 .treeview span.icon {
     margin-right: 5px;
-    margin-left: -18px;
 }
 
 span.icon.node-icon:before {

diff --git a/geonode/static/gruntfile.js b/geonode/static/gruntfile.js
@@ -95,6 +95,35 @@ module.exports = function(grunt) {
           cwd: 'node_modules',
           dest: 'lib/img',
           src: fileHandling.images
+        },
+        {
+          expand: true,
+          flatten: true,
+          nonull: true,
+          cwd: 'node_modules',
+          dest: 'lib/fonts',
+          src: fileHandling.lib_fonts
+        },{
+          expand: true,
+          flatten: true,
+          nonull: true,
+          cwd: 'node_modules',
+          dest: 'lib/css/fonts',
+          src: fileHandling.lib_css_fonts
+        },{
+          expand: true,
+          flatten: true,
+          nonull: true,
+          cwd: 'node_modules',
+          dest: 'lib/css/assets',
+          src: fileHandling.lib_css_assets
+        }, {
+          expand: true,
+          flatten: true,
+          nonull: true,
+          cwd: 'node_modules',
+          dest: 'lib/css',
+          src: fileHandling.lib_css_png
         }, {
           expand: true,
           flatten: true,

diff --git a/geonode/static/lib/css/assets.min.css b/geonode/static/lib/css/assets.min.css
diff --git a/geonode/static/lib/css/jquery-ui.theme.css b/geonode/static/lib/css/jquery-ui.theme.css
@@ -8,6 +8,7 @@
  *
  * http://api.jqueryui.com/category/theming/
  *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?bgShadowXPos=&bgOverlayXPos=&bgErrorXPos=&bgHighlightXPos=&bgContentXPos=&bgHeaderXPos=&bgActiveXPos=&bgHoverXPos=&bgDefaultXPos=&bgShadowYPos=&bgOverlayYPos=&bgErrorYPos=&bgHighlightYPos=&bgContentYPos=&bgHeaderYPos=&bgActiveYPos=&bgHoverYPos=&bgDefaultYPos=&bgShadowRepeat=&bgOverlayRepeat=&bgErrorRepeat=&bgHighlightRepeat=&bgContentRepeat=&bgHeaderRepeat=&bgActiveRepeat=&bgHoverRepeat=&bgDefaultRepeat=&iconsHover=url(%22images%2Fui-icons_555555_256x240.png%22)&iconsHighlight=url(%22images%2Fui-icons_777620_256x240.png%22)&iconsHeader=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsError=url(%22images%2Fui-icons_cc0000_256x240.png%22)&iconsDefault=url(%22images%2Fui-icons_777777_256x240.png%22)&iconsContent=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsActive=url(%22images%2Fui-icons_ffffff_256x240.png%22)&bgImgUrlShadow=&bgImgUrlOverlay=&bgImgUrlHover=&bgImgUrlHighlight=&bgImgUrlHeader=&bgImgUrlError=&bgImgUrlDefault=&bgImgUrlContent=&bgImgUrlActive=&opacityFilterShadow=Alpha(Opacity%3D30)&opacityFilterOverlay=Alpha(Opacity%3D30)&opacityShadowPerc=30&opacityOverlayPerc=30&iconColorHover=%23555555&iconColorHighlight=%23777620&iconColorHeader=%23444444&iconColorError=%23cc0000&iconColorDefault=%23777777&iconColorContent=%23444444&iconColorActive=%23ffffff&bgImgOpacityShadow=0&bgImgOpacityOverlay=0&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityContent=75&bgImgOpacityHeader=75&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgTextureShadow=flat&bgTextureOverlay=flat&bgTextureError=flat&bgTextureHighlight=flat&bgTextureContent=flat&bgTextureHeader=flat&bgTextureActive=flat&bgTextureHover=flat&bgTextureDefault=flat&cornerRadius=3px&fwDefault=normal&ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&cornerRadiusShadow=8px&thicknessShadow=5px&offsetLeftShadow=0px&offsetTopShadow=0px&opacityShadow=.3&bgColorShadow=%23666666&opacityOverlay=.3&bgColorOverlay=%23aaaaaa&fcError=%235f3f3f&borderColorError=%23f1a899&bgColorError=%23fddfdf&fcHighlight=%23777620&borderColorHighlight=%23dad55e&bgColorHighlight=%23fffa90&fcContent=%23333333&borderColorContent=%23dddddd&bgColorContent=%23ffffff&fcHeader=%23333333&borderColorHeader=%23dddddd&bgColorHeader=%23e9e9e9&fcActive=%23ffffff&borderColorActive=%23003eff&bgColorActive=%23007fff&fcHover=%232b2b2b&borderColorHover=%23cccccc&bgColorHover=%23ededed&fcDefault=%23454545&borderColorDefault=%23c5c5c5&bgColorDefault=%23f6f6f6
  */
 
 
@@ -204,7 +205,7 @@ a.ui-button:active,
 .ui-state-focus .ui-icon,
 .ui-button:hover .ui-icon,
 .ui-button:focus .ui-icon {
-
+	background-image: url("../img/ui-icons_555555_256x240.png");
 }
 .ui-state-active .ui-icon,
 .ui-button:active .ui-icon {

diff --git a/geonode/static/lib/js/assets.min.js b/geonode/static/lib/js/assets.min.js
diff --git a/geonode/static/lib/js/leaflet-plugins.min.js b/geonode/static/lib/js/leaflet-plugins.min.js
diff --git a/geonode/static/static_dependencies.json b/geonode/static/static_dependencies.json
@@ -116,5 +116,17 @@
       "timeago/*.png",
       "timeago/*.png",
       "zeroclipboard/dist/ZeroClipboard.swf"
+    ],
+    "lib_fonts": [
+        "bootstrap/fonts/*"
+      ],
+    "lib_css_fonts": [
+        "raty-js/lib/fonts/*"
+      ],
+    "lib_css_assets": [
+      "leaflet-measure/assets/*"
+    ],
+    "lib_css_png": [
+      "leaflet-fullscreen/dist/*.png"
     ]
 }