Updated Denim's css source files with node modules

Geeklog-Core · Mar 27, 2016 · ea67150 · ea67150
1 parent 651699e
commit ea67150
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 72 deletions.
diff --git a/public_html/layout/denim/css_ltr/style.css b/public_html/layout/denim/css_ltr/style.css
@@ -1,4 +1,4 @@
-/* Geeklog Denim Theme 1.1.0 | Copyright (C) 2012-2015 by dengen | http://www.trybese.com/~dengen/log/ | License:GPLv2 */
+/* Geeklog Denim Theme 1.1.0 | Copyright (C) 2012-2016 by dengen | http://www.trybese.com/~dengen/log/ | License:GPL-2.0+ */
 address {
   font-style: normal;
   font-weight: normal;
@@ -130,7 +130,7 @@ select[multiple="multiple"] {
 }
 
 option {
-  padding-right: 4px;
+  padding-right: 4px /* for Firefox */;
 }
 
 input[type="text"]:focus,
@@ -189,11 +189,6 @@ input[type="reset"] {
   -webkit-background-origin: border;
   -moz-background-origin: border;
   background-origin: border-box;
-  background-image: -webkit--webkit-linear-gradient(top, #FFF, #EEE);
-  background-image: -webkit--moz-linear-gradient(top, #FFF, #EEE);
-  background-image: -webkit--o-linear-gradient(top, #FFF, #EEE);
-  background-image: -webkit--ms-linear-gradient(top, #FFF, #EEE);
-  background-image: -webkit-linear-gradient(to bottom, #FFF, #EEE);
   background-image: -webkit-linear-gradient(top, #FFF, #EEE);
   background-image: -moz-linear-gradient(top, #FFF, #EEE);
   background-image: -o-linear-gradient(top, #FFF, #EEE);
@@ -980,6 +975,7 @@ fieldset.form_block {
   padding: 0;
 }
 
+/* Description */
 .compact dd.description {
   margin: -.5em 0 1em 25%;
   padding: 0;
@@ -1011,6 +1007,7 @@ fieldset.form_block {
     padding: 0;
   }
 
+  /* Description */
   .compact dd.description {
     margin: -.5em 0 1em 0;
     padding: 0;
@@ -1041,6 +1038,7 @@ fieldset.form_block {
   padding: 0;
 }
 
+/* Description */
 .linear dd.description {
   margin: -.5em 0 1em 0;
   padding: 0;
@@ -1639,7 +1637,7 @@ body.center-right #config_content {
     overflow: visible;
     float: left;
     width: 100%;
-    margin-left: -230px;
+    margin-left: -230px /* -[R] */;
   }
 
   body.js_off #centerblocks {
@@ -2420,8 +2418,6 @@ h4 img {
   border-radius: 6px;
   -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);
   box-shadow: 0 1px 2px rgba(0,0,0,.1);
-  /* Title */
-  /* Message */
 }
 
 .block-message dl {
@@ -3544,7 +3540,7 @@ span.warning em {
 
 /* Account Information */
 #profile-userprofile {
-  overflow: hidden;
+  overflow: hidden /* Adjust floating element */;
   margin: 0;
   padding: 0;
   zoom: 1;

diff --git a/public_html/layout/denim/css_ltr/style.min.css b/public_html/layout/denim/css_ltr/style.min.css
diff --git a/public_html/layout/denim/css_rtl/style.css b/public_html/layout/denim/css_rtl/style.css
@@ -1,4 +1,4 @@
-/* Geeklog Denim Theme 1.1.0 | Copyright (C) 2012-2015 by dengen | http://www.trybese.com/~dengen/log/ | License:GPLv2 */
+/* Geeklog Denim Theme 1.1.0 | Copyright (C) 2012-2016 by dengen | http://www.trybese.com/~dengen/log/ | License:GPL-2.0+ */
 address {
   font-style: normal;
   font-weight: normal;
@@ -130,7 +130,7 @@ select[multiple="multiple"] {
 }
 
 option {
-  padding-left: 4px;
+  padding-left: 4px ;
 }
 
 input[type="text"]:focus,
@@ -189,11 +189,6 @@ input[type="reset"] {
   -webkit-background-origin: border;
   -moz-background-origin: border;
   background-origin: border-box;
-  background-image: -webkit--webkit-linear-gradient(top, #FFF, #EEE);
-  background-image: -webkit--moz-linear-gradient(top, #FFF, #EEE);
-  background-image: -webkit--o-linear-gradient(top, #FFF, #EEE);
-  background-image: -webkit--ms-linear-gradient(top, #FFF, #EEE);
-  background-image: -webkit-linear-gradient(to bottom, #FFF, #EEE);
   background-image: -webkit-linear-gradient(top, #FFF, #EEE);
   background-image: -moz-linear-gradient(top, #FFF, #EEE);
   background-image: -o-linear-gradient(top, #FFF, #EEE);
@@ -980,6 +975,7 @@ fieldset.form_block {
   padding: 0;
 }
 
+/* Description */
 .compact dd.description {
   margin: -.5em 25% 1em 0;
   padding: 0;
@@ -1011,6 +1007,7 @@ fieldset.form_block {
     padding: 0;
   }
 
+  /* Description */
   .compact dd.description {
     margin: -.5em 0 1em 0;
     padding: 0;
@@ -1041,6 +1038,7 @@ fieldset.form_block {
   padding: 0;
 }
 
+/* Description */
 .linear dd.description {
   margin: -.5em 0 1em 0;
   padding: 0;
@@ -1639,7 +1637,7 @@ body.center-right #config_content {
     overflow: visible;
     float: right;
     width: 100%;
-    margin-right: -230px;
+    margin-right: -230px ;
   }
 
   body.js_off #centerblocks {
@@ -2420,8 +2418,6 @@ h4 img {
   border-radius: 6px;
   -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);
   box-shadow: 0 1px 2px rgba(0,0,0,.1);
-  /* Title */
-  /* Message */
 }
 
 .block-message dl {
@@ -2916,7 +2912,7 @@ div.third-party-login {
 --------------------------------------*/
 
 .gl-tooltip span {
-  margin-left: -999em;
+  margin-right: -999em;
   position: absolute;
   text-align: right;
   width: 250px;
@@ -2943,7 +2939,7 @@ div.third-party-login {
   right: 2.2em;
   top: 2.2em;
   z-index: 99;
-  margin-left: 0;
+  margin-right: 0;
   width: 250px;
 }
 
@@ -3455,7 +3451,7 @@ span.warning em {
 #exclude_topic > .checkboxes-list > li,
 #boxesblock > .checkboxes-list > li {
   /* display: inline */
-  margin-left: .5em;
+  margin-right: .5em;
 }
 
 /*--------------------------------------
@@ -3544,7 +3540,7 @@ span.warning em {
 
 /* Account Information */
 #profile-userprofile {
-  overflow: hidden;
+  overflow: hidden ;
   margin: 0;
   padding: 0;
   zoom: 1;
@@ -3674,7 +3670,7 @@ dd#profile-user_photo {
 .admin-menu-icon {
   float: right;
   padding: 5px;
-  margin-left: 10px;
+  margin-right: 10px;
   width: 48px;
   height: 48px;
 }

diff --git a/public_html/layout/denim/css_rtl/style.min.css b/public_html/layout/denim/css_rtl/style.min.css
diff --git a/public_html/layout/denim/css_src/gulpfile.js b/public_html/layout/denim/css_src/gulpfile.js
@@ -7,7 +7,7 @@ var pkg         = require('./package.json'),
     runSequence = require('run-sequence').use(gulp),
     shell       = require('gulp-shell'),
     rename      = require('gulp-rename'),
-    minifycss   = require('gulp-minify-css'),
+    cleancss    = require('gulp-clean-css'),
     csscomb     = require('gulp-csscomb'),
     //cmq         = require('gulp-combine-media-queries'),
     //csso        = require('gulp-csso'),
@@ -19,7 +19,7 @@ var pkg         = require('./package.json'),
 
 //var site_url  = 'http://localhost:8000/your_site'; // set the same value as the $_CONF['site_url']
 
-var banner = "<%= pkg.title %> <%= pkg.version %> | Copyright (C) 2012-2015 by <%= pkg.author %> | <%= pkg.homepage %> | License:<%= pkg.license %>";
+var banner = "<%= pkg.title %> <%= pkg.version %> | Copyright (C) 2012-2016 by <%= pkg.author %> | <%= pkg.homepage %> | License:<%= pkg.license %>";
 
 gulp.task('default', ['build'], function() {
 
@@ -63,7 +63,7 @@ gulp.task('minify', function() {
         .pipe(rename({ suffix: '.min' }))
         //.pipe(cmq())
         //.pipe(csso())
-        .pipe(minifycss())
+        .pipe(cleancss())
         .pipe(header("/* " + banner + " */\n", { 'pkg' : pkg } ))
         .pipe(gulp.dest('./dest/'));
 });

diff --git a/public_html/layout/denim/css_src/package.json b/public_html/layout/denim/css_src/package.json
@@ -15,25 +15,27 @@
     "theme"
   ],
   "author": "dengen",
-  "license": "GPLv2",
+  "license": "GPL-2.0+",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Geeklog-Core/geeklog.git"
+  },
   "devDependencies": {
     "R2": "^1.4.3",
-    "browser-sync": "^2.2.4",
-    "glob": "^5.0.3",
-    "gulp": "^3.8.10",
-    "gulp-combine-media-queries": "^0.2.0",
-    "gulp-csscomb": "^3.0.3",
-    "gulp-csso": "^0.2.9",
-    "gulp-header": "^1.2.2",
-    "gulp-minify-css": "^0.3.11",
-    "gulp-rename": "^1.2.0",
-    "gulp-replace": "^0.5.3",
-    "gulp-shell": "^0.2.11",
-    "gulp-stylus": "^2.0.0",
-    "gulp-watch": "^4.2.1",
-    "mkdirp": "^0.5.0",
+    "browser-sync": "^2.11.2",
+    "glob": "^7.0.3",
+    "gulp": "^3.9.1",
+    "gulp-clean-css": "^2.0.4",
+    "gulp-csscomb": "^3.0.7",
+    "gulp-header": "^1.7.1",
+    "gulp-rename": "^1.2.2",
+    "gulp-replace": "^0.5.4",
+    "gulp-shell": "^0.5.2",
+    "gulp-stylus": "^2.3.1",
+    "gulp-watch": "^4.3.5",
+    "mkdirp": "^0.5.1",
     "nib": "^1.1.0",
-    "run-sequence": "^1.0.2",
-    "stylus": "^0.49.3"
+    "run-sequence": "^1.1.5",
+    "stylus": "^0.54.2"
   }
 }
diff --git a/public_html/layout/denim/css_src/src/stylus/sub/base.styl b/public_html/layout/denim/css_src/src/stylus/sub/base.styl
@@ -205,7 +205,6 @@ input[type="reset"]
         border: 1px solid rgba(0, 0, 0, 0.2)
         border-bottom-color: rgba(0, 0, 0, 0.3)
         background-origin: border-box
-        background-image: -webkit-linear-gradient(top, #ffffff, #eeeeee)
         background-image: linear-gradient(to bottom, #ffffff, #eeeeee)
         border-radius: 4px
         text-shadow: 0 1px 0 #ffffff

diff --git a/public_html/layout/denim/css_src/src/stylus/sub/block_contents.styl b/public_html/layout/denim/css_src/src/stylus/sub/block_contents.styl
@@ -19,7 +19,7 @@ $stage = 'block_contents'
     hook-selector($stage, "" + selector())
 
 #wrapper
-    /*! Adjust floating element */
+    /* Adjust floating element */
     overflow: visible;
     background-color: $wrapper-background
     padding: 30px $wrapper-padding
@@ -521,7 +521,7 @@ h4 img
         margin: 0
         padding: 0
 
-    /*! Title */
+    // Title
     dt
         margin: 0
         padding: 4px 8px
@@ -532,7 +532,7 @@ h4 img
         border: $bd solid rgba(0, 0, 0, 0.2)
         border-radius: $rd $rd 0px 0px
 
-    /*! Message */
+    // Message
     dd
         margin: 0
         padding: 8px 12px

diff --git a/public_html/layout/denim/css_src/src/stylus/sub/compatible.styl b/public_html/layout/denim/css_src/src/stylus/sub/compatible.styl
@@ -81,7 +81,7 @@ $stage = 'compatible'
 /*! Forms */
 
 .form-description
-    /*! used with calendar plugin */
+    /* used with calendar plugin */
     font-weight: bold
     float: left
     width: 100px
@@ -90,22 +90,22 @@ $stage = 'compatible'
     display: block
 
 .form-field
-    /*! used with calendar plugin */
+    /* used with calendar plugin */
     padding-bottom: 5px
     margin-left: 105px
 
 .checkboxes-list
-    /*! this is used for example by COM_checkList */
+    /* this is used for example by COM_checkList */
     list-style: none
     padding: 0
     margin: 0
 
 .checkboxes-list span
-    /*! space between the text and the checkbox */
+    /* space between the text and the checkbox */
     padding-left: 5px
 
 .checkboxes-list .gldefault
-    /*! default blocks in the user settings block list */
+    /* default blocks in the user settings block list */
     font-weight: bold
 
 .highlight

diff --git a/public_html/layout/denim/css_src/src/stylus/sub/form_basic.styl b/public_html/layout/denim/css_src/src/stylus/sub/form_basic.styl
@@ -117,7 +117,7 @@ for num in (1..10)
 
 @media only screen and (max-width: $breakpoint-medium-max)
 
-    /*!--------------------------------------
+    /*--------------------------------------
       From 2 Column Form To 1 Column Form
     --------------------------------------*/
 

diff --git a/public_html/layout/denim/css_src/src/stylus/sub/layout/layout_3cols_LRbar.styl b/public_html/layout/denim/css_src/src/stylus/sub/layout/layout_3cols_LRbar.styl
@@ -183,7 +183,7 @@ body.js_off #leftblocks
     overflow: visible
     float: left
     width: $layout-left-block-width
-    /*! Left Margin = -[W] */
+    /* Left Margin = -[W] */
     margin: 0 0 0 (- $layout-site-inner-width + ($wrapper-padding * 2) + ($wrapper-border-size * 2))
     padding: 0
 
@@ -199,25 +199,25 @@ body.js_off #leftblocks
 /*! 3 Column ( left-center-right ) */
 body.left-center-right #main-content,
 body.js_off #main-content
-    /*! Main Content Width = [W] - [L] - [R] - Right Padding 10px - Left Padding 10px */
+    /* Main Content Width = [W] - [L] - [R] - Right Padding 10px - Left Padding 10px */
     width: $layout-site-inner-width - $layout-left-block-width - $layout-right-block-width - ($layout-side-padding * 2) - ($wrapper-padding * 2) - ($wrapper-border-size * 2)
-    /*! Right Margin = [R] , Left Margin = [L] */
+    /* Right Margin = [R] , Left Margin = [L] */
     margin: 0 $layout-right-block-width 0 $layout-left-block-width
     padding: 0 $layout-side-padding
 
 /*! 2 Column ( left-center ) */
 body.left-center #main-content
-    /*! Main Content Width = [W] - [L] - Right Padding 10px - Left Padding 10px */
+    /* Main Content Width = [W] - [L] - Right Padding 10px - Left Padding 10px */
     width: $layout-site-inner-width - $layout-left-block-width - ($layout-side-padding * 2) - ($wrapper-padding * 2) - ($wrapper-border-size * 2)
-    /*! Left Margin = [L] */
+    /* Left Margin = [L] */
     margin: 0 0 0 $layout-left-block-width
     padding: 0 $layout-side-padding
 
 /*! 2 Column ( center-right ) */
 body.center-right #main-content
-    /*! Main Content Width = [W] - [R] - Right Padding 10px - Left Padding 10px */
+    /* Main Content Width = [W] - [R] - Right Padding 10px - Left Padding 10px */
     width: $layout-site-inner-width - $layout-right-block-width - ($layout-side-padding * 2) - ($wrapper-padding * 2) - ($wrapper-border-size * 2)
-    /*! Right Margin = [R] */
+    /* Right Margin = [R] */
     margin: 0 $layout-right-block-width 0 0
     padding: 0 $layout-side-padding
 
@@ -235,7 +235,7 @@ body.js_off #rightblocks
     overflow: visible
     float: left
     width: $layout-right-block-width
-    /*! Right Margin = -[R] */
+    /* Right Margin = -[R] */
     margin: 0 0 0 (- $layout-right-block-width)
 
 /*!--------------------------------------