Skip to content

Commit

Permalink
Merge branch 'master' into feature/integrate-uikit
Browse files Browse the repository at this point in the history
  • Loading branch information
@dengenxp
dengenxp committed Apr 17, 2016
2 parents 3677608 + b503b58 commit 36e2cd8
Show file tree
Hide file tree
Showing 115 changed files with 449 additions and 8,888 deletions.
38 changes: 19 additions & 19 deletions public_html/layout/denim/css_rtl/style.css
View file
Expand Up @@ -130,7 +130,7 @@ select[multiple="multiple"] {
}

option {
padding-left: 4px ;
padding-left: 4px /* for Firefox */;
}

input[type="text"]:focus,
Expand Down Expand Up @@ -1637,7 +1637,7 @@ body.center-right #config_content {
overflow: visible;
float: right;
width: 100%;
margin-right: -230px ;
margin-right: -230px /* -[R] */;
}

body.js_off #centerblocks {
Expand Down Expand Up @@ -2535,56 +2535,56 @@ input[type="text"].search {
right: 0;
width: 141px;
background: url("/images/oauth-login-with-sprite.png") no-repeat;
background-position: 0 0;
background-position: 100% 0;
}

#login_twitter {
right: 0;
width: 141px;
background: url("/images/oauth-login-with-sprite.png") no-repeat;
background-position: 0 -23px;
background-position: 100% -23px;
}

#login_linkedin {
right: 0;
width: 141px;
background: url("/images/oauth-login-with-sprite.png") no-repeat;
background-position: 0 -44px;
background-position: 100% -44px;
}

#login_google {
right: 0;
width: 141px;
background: url("/images/oauth-login-with-sprite.png") no-repeat;
background-position: 0 -66px;
background-position: 100% -66px;
}

#login_yahoo {
right: 0;
width: 141px;
background: url("/images/oauth-login-with-sprite.png") no-repeat;
background-position: 0 -88px;
background-position: 100% -88px;
}

#login_microsoft {
right: 0;
width: 141px;
background: url("/images/oauth-login-with-sprite.png") no-repeat;
background-position: 0 -110px;
background-position: 100% -110px;
}

#login_github {
right: 0;
width: 141px;
background: url("/images/oauth-login-with-sprite.png") no-repeat;
background-position: 0 -132px;
background-position: 100% -132px;
}

#login_openid {
right: 0;
width: 141px;
background: url("/images/oauth-login-with-sprite.png") no-repeat;
background-position: 0 -154px;
background-position: 100% -154px;
}

#loginform fieldset {
Expand Down Expand Up @@ -2912,9 +2912,9 @@ div.third-party-login {
--------------------------------------*/

.gl-tooltip span {
margin-right: -999em;
margin-left: -999em;
position: absolute;
text-align: right;
text-align: left;
width: 250px;
}

Expand All @@ -2929,8 +2929,8 @@ div.third-party-login {
.gl-tooltip:hover span {
-webkit-border-radius: 8px;
border-radius: 8px;
-webkit-box-shadow: 2px 2px 8px #666;
box-shadow: 2px 2px 8px #666;
-webkit-box-shadow: -2px 2px 8px #666;
box-shadow: -2px 2px 8px #666;
font-size: 1em;
text-align: right;
white-space: normal;
Expand All @@ -2939,7 +2939,7 @@ div.third-party-login {
right: 2.2em;
top: 2.2em;
z-index: 99;
margin-right: 0;
margin-left: 0;
width: 250px;
}

Expand Down Expand Up @@ -3047,7 +3047,7 @@ span.warning em {

#commentbar {
padding: 3px;
background: none repeat scroll 0 0 #EEE;
background: none repeat scroll 100% 0 #EEE;
-webkit-border-radius: 4px;
border-radius: 4px;
zoom: 1;
Expand Down Expand Up @@ -3451,7 +3451,7 @@ span.warning em {
#exclude_topic > .checkboxes-list > li,
#boxesblock > .checkboxes-list > li {
/* display: inline */
margin-right: .5em;
margin-left: .5em;
}

/*--------------------------------------
Expand Down Expand Up @@ -3540,7 +3540,7 @@ span.warning em {

/* Account Information */
#profile-userprofile {
overflow: hidden ;
overflow: hidden /* Adjust floating element */;
margin: 0;
padding: 0;
zoom: 1;
Expand Down Expand Up @@ -3670,7 +3670,7 @@ dd#profile-user_photo {
.admin-menu-icon {
float: right;
padding: 5px;
margin-right: 10px;
margin-left: 10px;
width: 48px;
height: 48px;
}
Expand Down
2 changes: 1 addition & 1 deletion public_html/layout/denim/css_rtl/style.min.css
View file

Large diffs are not rendered by default.

31 changes: 12 additions & 19 deletions public_html/layout/denim/css_src/gulpfile.js
View file
Expand Up @@ -5,14 +5,12 @@ var pkg = require('./package.json'),
gulp = require('gulp'),
stylus = require('gulp-stylus'),
runSequence = require('run-sequence').use(gulp),
shell = require('gulp-shell'),
rename = require('gulp-rename'),
cleancss = require('gulp-clean-css'),
csscomb = require('gulp-csscomb'),
//cmq = require('gulp-combine-media-queries'),
//csso = require('gulp-csso'),
header = require('gulp-header'),
replace = require('gulp-replace'),
rtlcss = require('gulp-rtlcss'),
watch = require('gulp-watch'),
nib = require('nib'),
browserSync = require('browser-sync');
Expand Down Expand Up @@ -41,7 +39,7 @@ gulp.task('bs-reload', function () {
});

gulp.task('build', function() {
runSequence('stylus', 'copy_LR', 'swap_LR', 'fix_issue', 'minify', 'modify', 'deploy', function() {
runSequence('stylus', 'copy_LR', 'rtlcss', 'modify1', 'minify', 'modify2', 'deploy', function() {
browserSync.reload();
});
});
Expand All @@ -52,7 +50,6 @@ gulp.task('stylus', function() {
use: nib(),
compress: false
}))
//.pipe(cmq())
.pipe(csscomb())
.pipe(header("/* " + banner + " */\n", { 'pkg' : pkg } ))
.pipe(gulp.dest('./dest/css_ltr'));
Expand All @@ -61,8 +58,6 @@ gulp.task('stylus', function() {
gulp.task('minify', function() {
return gulp.src(['!./dest/**/*.min.css', './dest/**/*.css'])
.pipe(rename({ suffix: '.min' }))
//.pipe(cmq())
//.pipe(csso())
.pipe(cleancss())
.pipe(header("/* " + banner + " */\n", { 'pkg' : pkg } ))
.pipe(gulp.dest('./dest/'));
Expand All @@ -78,24 +73,22 @@ gulp.task('copy_LR', function() {
.pipe(gulp.dest('./dest/css_rtl/'));
});

gulp.task('swap_LR', function() {
return shell.task('r2 ./dest/css_rtl/style.css ./dest/css_rtl/style.css --no-compress')();
gulp.task('rtlcss', function() {
return gulp.src('./dest/css_rtl/style.css')
.pipe(rtlcss())
.pipe(gulp.dest('./dest/css_rtl/'));
});

gulp.task('fix_issue', function() {
return gulp.src('./dest/css_rtl/style.css')
.pipe(replace(/\.gl-tooltip span((?:\n|.)+?)margin-right/mg,
gulp.task('modify1', function() {
return gulp.src('./dest/css_ltr/style.css')
.pipe(replace(/$\s*\/\*rtl:ignore\*\//mg,
function(str, p1, offset, s) {
return '.gl-tooltip span' + p1 + 'margin-left';
return '';
}))
.pipe(replace(/\.gl-tooltip:hover span((?:\n|.)+?)margin-right/mg,
function(str, p1, offset, s) {
return '.gl-tooltip:hover span' + p1 + 'margin-left';
}))
.pipe(gulp.dest('./dest/css_rtl/'));
.pipe(gulp.dest('./dest/css_ltr/'));
});

gulp.task('modify', function(done) {
gulp.task('modify2', function(done) {

var regex = /(\/\*\/?(?:\n|[^\/]|[^\*]\/)*\*\/)|(^@media\s+[^\n]+\{\n(?:\n|.)*?\n\})|(^(?:#|\.|\w)(?:\n|.)+?\{\n(?:\n|.)*?\n\})/mg;

Expand Down
3 changes: 1 addition & 2 deletions public_html/layout/denim/css_src/package.json
View file
Expand Up @@ -21,7 +21,6 @@
"url": "https://github.com/Geeklog-Core/geeklog.git"
},
"devDependencies": {
"R2": "^1.4.3",
"browser-sync": "^2.11.2",
"glob": "^7.0.3",
"gulp": "^3.9.1",
Expand All @@ -30,7 +29,7 @@
"gulp-header": "^1.7.1",
"gulp-rename": "^1.2.2",
"gulp-replace": "^0.5.4",
"gulp-shell": "^0.5.2",
"gulp-rtlcss": "^1.0.0",
"gulp-stylus": "^2.3.1",
"gulp-watch": "^4.3.5",
"mkdirp": "^0.5.1",
Expand Down
2 changes: 2 additions & 0 deletions public_html/layout/denim/css_src/src/stylus/sub/main_contents.styl
View file
Expand Up @@ -130,6 +130,7 @@ $stage = 'main_contents'

.gl-tooltip
span
/*rtl:ignore*/
margin-left: -999em
position: absolute
text-align: left
Expand All @@ -152,6 +153,7 @@ $stage = 'main_contents'
left: 2.2em
top: 2.2em
z-index: 99
/*rtl:ignore*/
margin-left: 0
width: 250px
img.icon
Expand Down
16 changes: 1 addition & 15 deletions public_html/vendor/uikit/css_rtl/components/autocomplete.almost-flat.css
View file
@@ -1,16 +1,13 @@
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */

/* ========================================================================
Component: Autocomplete
========================================================================== */

/*
* 1. Container width fits its content
* 2. Create position context
* 3. Prevent `inline-block` consequences
* 4. Remove the gap between the container and its child element
*/

.uk-autocomplete {
/* 1 */
display: inline-block;
Expand All @@ -21,30 +18,23 @@
/* 4 */
vertical-align: middle;
}

/* Legacy dropdown modifier */

.uk-dropdown-flip {
right: auto;
left: 0;
}

/* Nav modifier `uk-nav-autocomplete`
========================================================================== */

/*
* Items
*/

.uk-nav-autocomplete > li > a {
color: #444444;
}

/*
* Active
* 1. Remove default focus style
*/

.uk-nav-autocomplete > li.uk-active > a {
background: #00a8e6;
color: #ffffff;
Expand All @@ -53,19 +43,15 @@
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.1);
}

/*
* Sub-object: `uk-nav-header`
*/

.uk-nav-autocomplete .uk-nav-header {
color: #999999;
}

/*
* Sub-object: `uk-nav-divider`
*/

.uk-nav-autocomplete .uk-nav-divider {
border-top: 1px solid #dddddd;
}
}
16 changes: 1 addition & 15 deletions public_html/vendor/uikit/css_rtl/components/autocomplete.css
View file
@@ -1,16 +1,13 @@
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */

/* ========================================================================
Component: Autocomplete
========================================================================== */

/*
* 1. Container width fits its content
* 2. Create position context
* 3. Prevent `inline-block` consequences
* 4. Remove the gap between the container and its child element
*/

.uk-autocomplete {
/* 1 */
display: inline-block;
Expand All @@ -21,49 +18,38 @@
/* 4 */
vertical-align: middle;
}

/* Legacy dropdown modifier */

.uk-dropdown-flip {
right: auto;
left: 0;
}

/* Nav modifier `uk-nav-autocomplete`
========================================================================== */

/*
* Items
*/

.uk-nav-autocomplete > li > a {
color: #444444;
}

/*
* Active
* 1. Remove default focus style
*/

.uk-nav-autocomplete > li.uk-active > a {
background: #00a8e6;
color: #ffffff;
/* 1 */
outline: none;
}

/*
* Sub-object: `uk-nav-header`
*/

.uk-nav-autocomplete .uk-nav-header {
color: #999999;
}

/*
* Sub-object: `uk-nav-divider`
*/

.uk-nav-autocomplete .uk-nav-divider {
border-top: 1px solid #dddddd;
}
}

0 comments on commit 36e2cd8

Please sign in to comment.