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 Mar 11, 2016
2 parents 2fcb6e8 + 895b591 commit f44edce
Show file tree
Hide file tree
Showing 19 changed files with 285 additions and 301 deletions.
9 changes: 8 additions & 1 deletion .gitignore
View file
Expand Up @@ -59,5 +59,12 @@ backups/*.tar.gz
backups/*.tgz
backups/*.zip

#ignore thumbnails created by windows
# denim theme or uikit
dest/
node_modules/

# ignore thumbnails created by windows
**/Thumbs.db

# ignore thumbnails created by osx
.DS_Store
160 changes: 75 additions & 85 deletions public_html/layout/denim/css_ltr/style.css
View file
Expand Up @@ -324,6 +324,13 @@ input[type="reset"]:disabled {
margin: 0 1px 2px;
}

.uk-form input[type="checkbox"],
.uk-form input[type="radio"] {
margin-left: 3px;
margin-right: 3px;
vertical-align: middle;
}

.uk-form > .admin-list-search {
margin-bottom: .5em;
}
Expand Down Expand Up @@ -954,8 +961,7 @@ fieldset.form_block {
float: left;
clear: left;
width: 24%;
margin: 0 0 1em 0;
margin-top: 5px;
margin: 5px 0 1em 0;
padding: 0 1% 0 0;
font-weight: normal;
}
Expand All @@ -977,12 +983,10 @@ fieldset.form_block {
padding: 0;
}


.compact .controls_text {
margin-top: 5px;
}


@media only screen and (max-width: 962px) {

.compact dt {
Expand Down Expand Up @@ -1147,7 +1151,6 @@ ul.compact li {

#header-content {
width: auto;
max-width: $layout-site-max-width;
margin: 0 auto;
padding: 0;
width: 1140px;
Expand All @@ -1173,7 +1176,6 @@ ul.compact li {

.navigation_content {
width: 1124px;
max-width: $layout-site-max-width;
margin: 0 auto;
}

Expand All @@ -1185,7 +1187,6 @@ ul.compact li {

#wrapper {
width: 1140px;
max-width: $layout-site-max-width;
margin: 0 auto;
}

Expand Down Expand Up @@ -1282,7 +1283,6 @@ body.js_off #rightblocks {

#footer-content {
width: auto;
max-width: $layout-site-max-width;
margin: 0 auto;
width: 1140px;
}
Expand Down Expand Up @@ -1564,7 +1564,6 @@ body.center-right #config_content {

#header-content {
width: auto;
max-width: $layout-site-max-width;
margin: 0 auto;
padding: 0;
}
Expand All @@ -1589,7 +1588,6 @@ body.center-right #config_content {

.navigation_content {
width: auto;
max-width: $layout-site-max-width;
margin: 0 auto;
}

Expand All @@ -1601,7 +1599,6 @@ body.center-right #config_content {

#wrapper {
width: auto;
max-width: $layout-site-max-width;
margin: 0 auto;
}

Expand Down Expand Up @@ -1711,7 +1708,6 @@ body.center-right #config_content {

#footer-content {
width: auto;
max-width: $layout-site-max-width;
margin: 0 auto;
}
}
Expand Down Expand Up @@ -1757,7 +1753,7 @@ body.center-right #config_content {
#header {
width: auto;
margin: 0 auto;
height: 60px;
height: 80px;
}

#header:before {
Expand All @@ -1767,6 +1763,7 @@ body.center-right #config_content {
#header-content {
width: auto;
margin: 0 auto;
height: 100%;
padding: 0;
}

Expand Down Expand Up @@ -1853,28 +1850,29 @@ body.center-right #config_content {
float: none;
width: 100%;
margin: 0;
padding: 0;
padding: 10px 0 0 0;
}

/* 2 Column ( left-center ) */
body.left-center #main-content {
float: none;
width: 100%;
margin: 0;
padding: 0;
padding: 10px 0 0 0;
}

/* 2 Column ( center-right ) */
body.center-right #main-content {
float: none;
width: 100%;
margin: 0;
padding: 0;
padding: 10px 0 0 0;
}

/* 1 Column ( center ) */
body.center #main-content {
width: 100%;
padding-top: 10px;
}

body.center #centerblocks {
Expand Down Expand Up @@ -1980,7 +1978,7 @@ body.center-right #config_content {
-webkit-background-size: 256px auto;
-moz-background-size: 256px auto;
background-size: 256px auto;
height: 60px;
height: 80px;
margin-top: 0;
}
}
Expand All @@ -2007,9 +2005,12 @@ body.center-right #config_content {
@media only screen and (max-width: 767px) {

.site_name {
margin: 6px 0 0 8px;
float: none;
font-size: 1.6em;
line-height: 1.6em;
height: 50px;
line-height: 50px;
margin: 0 auto;
text-align: center;
}
}

Expand All @@ -2028,28 +2029,41 @@ body.center-right #config_content {

.site_slogan {
font-size: 75%;
clear: both;
float: none;
padding: 0 10px 0;
text-align: left;
margin: 0 auto;
padding: 0;
text-align: center;
line-height: 1.2em;
}
}

@media only screen and (max-width: 767px) {

.nameplate {
float: none;
height: 100%;
margin: 0 auto;
max-width: 230px;
text-align: center;
}
}

/*--------------------------------------
Global Navigation Content
--------------------------------------*/

/* Navigation Menu List */
#navigation {
padding: 0;
background: #E7E7E7;
border-top: 1px solid #EEE;
border-bottom: 1px solid #C7C7C7;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);
box-shadow: 0 1px 2px rgba(0,0,0,.1);
text-align: left;
text-shadow: 0 1px 0 #FFF;
background: #F7F7F7;
color: #444;
background-image: -webkit-linear-gradient(top, #FFF, #EEE);
background-image: linear-gradient(to bottom, #FFF, #EEE);
border: 1px solid rgba(0,0,0,.1);
border-bottom-color: rgba(0,0,0,.3);
background-origin: border-box;
}

@media only screen and (max-width: 767px) {
Expand Down Expand Up @@ -2084,33 +2098,20 @@ body.center-right #config_content {
border-left: 1px solid #D7D7D7;
}

/* Navigation Menu */
.menuitem a,
.menuitem a:link,
.menuitem a:visited {
color: #666;
#navigation .uk-navbar {
border: none;
}

.menuitem a:hover,
.menuitem a:focus,
.menuitem a:active {
color: #2664A2;
text-decoration: none;
background: #DFDFDF;
#navigation .uk-navbar-nav > li > a {
height: 31px;
}

.tinynav {
display: none;
#header-content > .uk-navbar-toggle {
height: 80px;
}

@media only screen and (max-width: 767px) {

.tinynav {
display: block;
width: 95%;
max-width: none;
margin: auto;
}
#header-search {
padding: 3px;
}

/*--------------------------------------
Expand Down Expand Up @@ -2179,42 +2180,9 @@ body.center-right #config_content {
}
}

/* Copyright */
.copyright {
float: left;
margin: 0;
padding-left: 8px;
line-height: 1.4em;
}

@media only screen and (max-width: 767px) {

.copyright {
float: none;
margin: 0 0 1em 0;
padding-left: 0;
padding-right: 8px;
text-shadow: 0 1px 1px rgba(0,0,0,.3);
}
}

/* Powered by & Page Execution Time */
.site_info {
float: right;
margin: 0;
padding-right: 15px;
text-align: right;
line-height: 1.4em;
}

@media only screen and (max-width: 767px) {

.site_info {
float: none;
text-align: left;
margin: 0;
padding-left: 4px;
padding-right: 8px;
#footer-content {
text-shadow: 0 1px 1px rgba(0,0,0,.3);
}
}
Expand Down Expand Up @@ -2417,7 +2385,7 @@ body.center-right #config_content {

#loginform-loginname,
#loginform-passwd {
width: 50%;
width: 75%;
}

/* Help Icon */
Expand Down Expand Up @@ -2887,6 +2855,18 @@ div.third-party-login {
margin: 15px;
}

.story_image + p,
.story_image + ul,
.story_image + ol,
.story_image + dl,
.story_image + blockquote,
.story_image + pre,
.story_image + address,
.story_image + fieldset,
.story_image + figure {
margin-top: 0;
}

/* Navigation */
.story_navi {
list-style-type: none;
Expand Down Expand Up @@ -3452,7 +3432,7 @@ span.warning em {
--------------------------------------*/

.bc_navigation {
margin: -1em 0 1em;
margin: 0 0 15px;
}

/*--------------------------------------
Expand Down Expand Up @@ -3872,6 +3852,11 @@ dd#profile-user_photo {
width: 100%;
}

.table-wrapper-visible {
width: 100%;
overflow: visible;
}

/* Navigation */
.admin-list-navi {
margin-top: .5em;
Expand Down Expand Up @@ -4264,7 +4249,7 @@ b.status_black {
margin-bottom: 15px;
}

.totop-scroller {
#totop-scroller {
position: fixed;
z-index: 99;
bottom: 20px;
Expand Down Expand Up @@ -4413,6 +4398,11 @@ body.center-right #config_content {
max-width: none;
}

.config_validation_error_block {
color: #D14;
font-size: 12px;
}

/* Smaller than standard 1280 (devices and browsers) */
@media only screen and (max-width: 962px) {

Expand Down

0 comments on commit f44edce

Please sign in to comment.