From ba9c9104f5d712ef5a2891cbfab4bd0af8fff087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Ko=CC=88nemann?= Date: Thu, 20 Aug 2015 19:14:59 +0200 Subject: [PATCH] Removing underscores SASS Because the underscores styling is overwritten by Bootstrap and some UnderStrap basic stylings there is no need to compile the underscores SASS code into the themes css file. Underscores JS files are still in use. --- bower.json | 4 +- css/theme.css | 701 +--------------------------------------------- css/theme.min.css | 126 +-------- gulpfile.js | 1 - sass/theme.scss | 6 +- 5 files changed, 20 insertions(+), 818 deletions(-) diff --git a/bower.json b/bower.json index a358a42..2ff4869 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "understrap", - "version": "0.0.0", - "homepage": "https://github.com/holger1411/understrap", + "version": "0.3.2", + "homepage": "http://understrap.com", "authors": [ "Holger Könemann " ], diff --git a/css/theme.css b/css/theme.css index c5dbf1e..df86fdd 100644 --- a/css/theme.css +++ b/css/theme.css @@ -2,7 +2,7 @@ /***************************************************************** Import all needed 3rd party sass files plus your own style and variables -1. ../bower_components/_s/sass/style // Adding underscores default styles ake sure you run bower install before! <- Dont edit this files! +1. ../bower_components/_s/sass/style // Adding underscores default styles. Don´t needed if you use Bootstrap for styling -------------------------------------- 2. theme/theme_variables.scss // Overwriting Bootstrap variables and for own variables <-- ADD YOUR VARIABLES HERE -------------------------------------- @@ -28,705 +28,6 @@ Import all needed 3rd party sass files plus your own style and variables // Any additional imported files // 6. theme/theme.scss"; // <-- ADD YOUR STYLES HERE ***************************************************************** */ -/*! -Theme Name: _s -Theme URI: http://underscores.me/ -Author: Automattic -Author URI: http://automattic.com/ -Description: Hi. I'm a starter theme called _s, or underscores, if you like. I'm a theme meant for hacking so don't use me as a Parent Theme. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for. -Version: 1.0.0 -License: GNU General Public License v2 or later -License URI: http://www.gnu.org/licenses/gpl-2.0.html -Text Domain: _s -Tags: - -This theme, like WordPress, is licensed under the GPL. -Use it to make something cool, have fun, and share what you've learned with others. - -_s is based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc. -Underscores is distributed under the terms of the GNU GPL v2 or later. - -Normalizing styles have been helped along thanks to the fine work of -Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/ -*/ -/*-------------------------------------------------------------- ->>> TABLE OF CONTENTS: ----------------------------------------------------------------- -# Normalize -# Typography -# Elements -# Forms -# Navigation - ## Links - ## Menus -# Accessibility -# Alignments -# Clearings -# Widgets -# Content - ## Posts and pages - ## Asides - ## Comments -# Infinite scroll -# Media - ## Captions - ## Galleries ---------------------------------------------------------------*/ -/*-------------------------------------------------------------- -# Normalize ---------------------------------------------------------------*/ -html { - font-family: sans-serif; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; } - -body { - margin: 0; } - -article, -aside, -details, -figcaption, -figure, -footer, -header, -main, -menu, -nav, -section, -summary { - display: block; } - -audio, -canvas, -progress, -video { - display: inline-block; - vertical-align: baseline; } - -audio:not([controls]) { - display: none; - height: 0; } - -[hidden], -template { - display: none; } - -a { - background-color: transparent; } - -a:active, -a:hover { - outline: 0; } - -abbr[title] { - border-bottom: 1px dotted; } - -b, -strong { - font-weight: bold; } - -dfn { - font-style: italic; } - -h1 { - font-size: 2em; - margin: 0.67em 0; } - -mark { - background: #ff0; - color: #000; } - -small { - font-size: 80%; } - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; } - -sup { - top: -0.5em; } - -sub { - bottom: -0.25em; } - -img { - border: 0; } - -svg:not(:root) { - overflow: hidden; } - -figure { - margin: 1em 40px; } - -hr { - box-sizing: content-box; - height: 0; } - -pre { - overflow: auto; } - -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; } - -button, -input, -optgroup, -select, -textarea { - color: inherit; - font: inherit; - margin: 0; } - -button { - overflow: visible; } - -button, -select { - text-transform: none; } - -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; - cursor: pointer; } - -button[disabled], -html input[disabled] { - cursor: default; } - -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; } - -input { - line-height: normal; } - -input[type="checkbox"], -input[type="radio"] { - box-sizing: border-box; - padding: 0; } - -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height: auto; } - -input[type="search"] { - -webkit-appearance: textfield; - box-sizing: content-box; } - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; } - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; } - -legend { - border: 0; - padding: 0; } - -textarea { - overflow: auto; } - -optgroup { - font-weight: bold; } - -table { - border-collapse: collapse; - border-spacing: 0; } - -td, -th { - padding: 0; } - -/*-------------------------------------------------------------- -# Typography ---------------------------------------------------------------*/ -body, -button, -input, -select, -textarea { - color: #404040; - font-family: sans-serif; - font-size: 16px; - font-size: 1rem; - line-height: 1.5; } - -h1, h2, h3, h4, h5, h6 { - clear: both; } - -p { - margin-bottom: 1.5em; } - -dfn, cite, em, i { - font-style: italic; } - -blockquote { - margin: 0 1.5em; } - -address { - margin: 0 0 1.5em; } - -pre { - background: #eee; - font-family: "Courier 10 Pitch", Courier, monospace; - font-size: 15px; - font-size: 0.9375rem; - line-height: 1.6; - margin-bottom: 1.6em; - max-width: 100%; - overflow: auto; - padding: 1.6em; } - -code, kbd, tt, var { - font-family: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace; - font-size: 15px; - font-size: 0.9375rem; } - -abbr, acronym { - border-bottom: 1px dotted #666; - cursor: help; } - -mark, ins { - background: #fff9c0; - text-decoration: none; } - -big { - font-size: 125%; } - -/*-------------------------------------------------------------- -# Elements ---------------------------------------------------------------*/ -html { - box-sizing: border-box; } - -*, -*:before, -*:after { - /* Inherit box-sizing to make it easier to change the property for components that leverage other behavior; see http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ */ - box-sizing: inherit; } - -body { - background: #fff; - /* Fallback for when there is no custom background color defined. */ } - -blockquote, q { - quotes: "" ""; } - blockquote:before, - blockquote:after, q:before, - q:after { - content: ""; } - -hr { - background-color: #ccc; - border: 0; - height: 1px; - margin-bottom: 1.5em; } - -ul, ol { - margin: 0 0 1.5em 3em; } - -ul { - list-style: disc; } - -ol { - list-style: decimal; } - -li > ul, -li > ol { - margin-bottom: 0; - margin-left: 1.5em; } - -dt { - font-weight: bold; } - -dd { - margin: 0 1.5em 1.5em; } - -img { - height: auto; - /* Make sure images are scaled correctly. */ - max-width: 100%; - /* Adhere to container width. */ } - -table { - margin: 0 0 1.5em; - width: 100%; } - -/*-------------------------------------------------------------- -# Forms ---------------------------------------------------------------*/ -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - border: 1px solid; - border-color: #ccc #ccc #bbb; - border-radius: 3px; - background: #e6e6e6; - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5), inset 0 15px 17px rgba(255, 255, 255, 0.5), inset 0 -5px 12px rgba(0, 0, 0, 0.05); - color: rgba(0, 0, 0, 0.8); - font-size: 12px; - font-size: 0.75rem; - line-height: 1; - padding: 0.6em 1em 0.4em; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); } - button:hover, - input[type="button"]:hover, - input[type="reset"]:hover, - input[type="submit"]:hover { - border-color: #ccc #bbb #aaa; - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), inset 0 15px 17px rgba(255, 255, 255, 0.8), inset 0 -5px 12px rgba(0, 0, 0, 0.02); } - button:active, - button:focus, - input[type="button"]:active, - input[type="button"]:focus, - input[type="reset"]:active, - input[type="reset"]:focus, - input[type="submit"]:active, - input[type="submit"]:focus { - border-color: #aaa #bbb #bbb; - box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15); } - -input[type="text"], -input[type="email"], -input[type="url"], -input[type="password"], -input[type="search"], -textarea { - color: #666; - border: 1px solid #ccc; - border-radius: 3px; } - input[type="text"]:focus, - input[type="email"]:focus, - input[type="url"]:focus, - input[type="password"]:focus, - input[type="search"]:focus, - textarea:focus { - color: #111; } - -input[type="text"], -input[type="email"], -input[type="url"], -input[type="password"], -input[type="search"] { - padding: 3px; } - -textarea { - padding-left: 3px; - width: 100%; } - -/*-------------------------------------------------------------- -# Navigation ---------------------------------------------------------------*/ -/*-------------------------------------------------------------- -## Links ---------------------------------------------------------------*/ -a { - color: royalblue; } - a:visited { - color: purple; } - a:hover, - a:focus, - a:active { - color: midnightblue; } - a:focus { - outline: thin dotted; } - a:hover, - a:active { - outline: 0; } - -/*-------------------------------------------------------------- -## Menus ---------------------------------------------------------------*/ -.main-navigation { - clear: both; - display: block; - float: left; - width: 100%; } - .main-navigation ul { - display: none; - list-style: none; - margin: 0; - padding-left: 0; } - .main-navigation ul ul { - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2); - float: left; - position: absolute; - top: 1.5em; - left: -999em; - z-index: 99999; } - .main-navigation ul ul ul { - left: -999em; - top: 0; } - .main-navigation ul ul li:hover > ul, - .main-navigation ul ul li.focus > ul { - left: 100%; } - .main-navigation ul ul a { - width: 200px; } - .main-navigation ul li:hover > ul, - .main-navigation ul li.focus > ul { - left: auto; } - .main-navigation li { - float: left; - position: relative; } - .main-navigation a { - display: block; - text-decoration: none; } - -/* Small menu. */ -.menu-toggle, -.main-navigation.toggled ul { - display: block; } - -@media screen and (min-width: 37.5em) { - .menu-toggle { - display: none; } - .main-navigation ul { - display: block; } } - -.site-main .comment-navigation, -.site-main .posts-navigation, -.site-main .post-navigation { - margin: 0 0 1.5em; - overflow: hidden; } - -.comment-navigation .nav-previous, -.posts-navigation .nav-previous, -.post-navigation .nav-previous { - float: left; - width: 50%; } - -.comment-navigation .nav-next, -.posts-navigation .nav-next, -.post-navigation .nav-next { - float: right; - text-align: right; - width: 50%; } - -/*-------------------------------------------------------------- -# Accessibility ---------------------------------------------------------------*/ -/* Text meant only for screen readers. */ -.screen-reader-text { - clip: rect(1px, 1px, 1px, 1px); - position: absolute !important; - height: 1px; - width: 1px; - overflow: hidden; } - .screen-reader-text:hover, - .screen-reader-text:active, - .screen-reader-text:focus { - background-color: #f1f1f1; - border-radius: 3px; - box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6); - clip: auto !important; - color: #21759b; - display: block; - font-size: 14px; - font-size: 0.875rem; - font-weight: bold; - height: auto; - left: 5px; - line-height: normal; - padding: 15px 23px 14px; - text-decoration: none; - top: 5px; - width: auto; - z-index: 100000; - /* Above WP toolbar. */ } - -/*-------------------------------------------------------------- -# Alignments ---------------------------------------------------------------*/ -.alignleft { - display: inline; - float: left; - margin-right: 1.5em; } - -.alignright { - display: inline; - float: right; - margin-left: 1.5em; } - -.aligncenter { - display: block; - margin-left: auto; - margin-right: auto; } - -/*-------------------------------------------------------------- -# Clearings ---------------------------------------------------------------*/ -.clear:before, -.clear:after, -.entry-content:before, -.entry-content:after, -.comment-content:before, -.comment-content:after, -.site-header:before, -.site-header:after, -.site-content:before, -.site-content:after, -.site-footer:before, -.site-footer:after { - content: ""; - display: table; } - -.clear:after, -.entry-content:after, -.comment-content:after, -.site-header:after, -.site-content:after, -.site-footer:after { - clear: both; } - -/*-------------------------------------------------------------- -# Widgets ---------------------------------------------------------------*/ -.widget { - margin: 0 0 1.5em; - /* Make sure select elements fit in widgets. */ } - .widget select { - max-width: 100%; } - -/* Search widget. */ -.widget_search .search-submit { - display: none; } - -/*-------------------------------------------------------------- -# Content ---------------------------------------------------------------*/ -/*-------------------------------------------------------------- -## Posts and pages ---------------------------------------------------------------*/ -.sticky { - display: block; } - -.hentry { - margin: 0 0 1.5em; } - -.byline, -.updated:not(.published) { - display: none; } - -.single .byline, -.group-blog .byline { - display: inline; } - -.page-content, -.entry-content, -.entry-summary { - margin: 1.5em 0 0; } - -.page-links { - clear: both; - margin: 0 0 1.5em; } - -/*-------------------------------------------------------------- -## Asides ---------------------------------------------------------------*/ -.blog .format-aside .entry-title, -.archive .format-aside .entry-title { - display: none; } - -/*-------------------------------------------------------------- -## Comments ---------------------------------------------------------------*/ -.comment-content a { - word-wrap: break-word; } - -.bypostauthor { - display: block; } - -/*-------------------------------------------------------------- -# Infinite scroll ---------------------------------------------------------------*/ -/* Globally hidden elements when Infinite Scroll is supported and in use. */ -.infinite-scroll .posts-navigation, .infinite-scroll.neverending .site-footer { - /* Theme Footer (when set to scrolling) */ - display: none; } - -/* When Infinite Scroll has reached its end we need to re-display elements that were hidden (via .neverending) before. */ -.infinity-end.neverending .site-footer { - display: block; } - -/*-------------------------------------------------------------- -# Media ---------------------------------------------------------------*/ -.page-content .wp-smiley, -.entry-content .wp-smiley, -.comment-content .wp-smiley { - border: none; - margin-bottom: 0; - margin-top: 0; - padding: 0; } - -/* Make sure embeds and iframes fit their containers. */ -embed, -iframe, -object { - max-width: 100%; } - -/*-------------------------------------------------------------- -## Captions ---------------------------------------------------------------*/ -.wp-caption { - margin-bottom: 1.5em; - max-width: 100%; } - .wp-caption img[class*="wp-image-"] { - display: block; - margin-left: auto; - margin-right: auto; } - .wp-caption .wp-caption-text { - margin: 0.8075em 0; } - -.wp-caption-text { - text-align: center; } - -/*-------------------------------------------------------------- -## Galleries ---------------------------------------------------------------*/ -.gallery { - margin-bottom: 1.5em; } - -.gallery-item { - display: inline-block; - text-align: center; - vertical-align: top; - width: 100%; } - .gallery-columns-2 .gallery-item { - max-width: 50%; } - .gallery-columns-3 .gallery-item { - max-width: 33.33%; } - .gallery-columns-4 .gallery-item { - max-width: 25%; } - .gallery-columns-5 .gallery-item { - max-width: 20%; } - .gallery-columns-6 .gallery-item { - max-width: 16.66%; } - .gallery-columns-7 .gallery-item { - max-width: 14.28%; } - .gallery-columns-8 .gallery-item { - max-width: 12.5%; } - .gallery-columns-9 .gallery-item { - max-width: 11.11%; } - -.gallery-caption { - display: block; } - /*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. diff --git a/css/theme.min.css b/css/theme.min.css index a6ec22c..99ee960 100644 --- a/css/theme.min.css +++ b/css/theme.min.css @@ -1,127 +1,27 @@ @charset "UTF-8"; -/*! -Theme Name: _s -Theme URI: http://underscores.me/ -Author: Automattic -Author URI: http://automattic.com/ -Description: Hi. I'm a starter theme called _s, or underscores, if you like. I'm a theme meant for hacking so don't use me as a Parent Theme. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for. -Version: 1.0.0 -License: GNU General Public License v2 or later -License URI: http://www.gnu.org/licenses/gpl-2.0.html -Text Domain: _s -Tags: - -This theme, like WordPress, is licensed under the GPL. -Use it to make something cool, have fun, and share what you've learned with others. - -_s is based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc. -Underscores is distributed under the terms of the GNU GPL v2 or later. - -Normalizing styles have been helped along thanks to the fine work of -Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/ -*/ -.screen-reader-text,.sr-only,svg:not(:root){overflow:hidden} -.clear:after,.comment-content:after,.dl-horizontal dd:after,.entry-content:after,.page-links,.site-content:after,.site-footer:after,.site-header:after,h1,h2,h3,h4,h5,h6{clear:both} -.comment-content a,pre{word-wrap:break-word} -.widget select,.wp-caption,embed,iframe,img,object,pre{max-width:100%} -cite,dfn,em,i{font-style:italic} -.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.pre-scrollable{max-height:340px} -.fa,.glyphicon{-moz-osx-font-smoothing:grayscale} -article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block} -p{margin-bottom:1.5em} -address{margin:0 0 1.5em} -pre{background:#eee;margin-bottom:1.6em} -code,kbd,tt,var{font-family:Monaco,Consolas,"Andale Mono","DejaVu Sans Mono",monospace;font-size:15px;font-size:.9375rem} -abbr,acronym{border-bottom:1px dotted #666;cursor:help} -ins,mark{background:#fff9c0;text-decoration:none} -big{font-size:125%} -body{background:#fff} -blockquote,q{quotes:"" ""} -blockquote:after,blockquote:before,q:after,q:before{content:""} -hr{background-color:#ccc} -ol,ul{margin:0 0 1.5em 3em} -ul{list-style:disc} -ol{list-style:decimal} -li>ol,li>ul{margin-bottom:0;margin-left:1.5em} -dd{margin:0 1.5em 1.5em} -img{height:auto} -table{margin:0 0 1.5em;width:100%;border-collapse:collapse;border-spacing:0} -button,input[type=button],input[type=reset],input[type=submit]{border:1px solid;border-color:#ccc #ccc #bbb;border-radius:3px;background:#e6e6e6;box-shadow:inset 0 1px 0 rgba(255,255,255,.5),inset 0 15px 17px rgba(255,255,255,.5),inset 0 -5px 12px rgba(0,0,0,.05);color:rgba(0,0,0,.8);font-size:12px;font-size:.75rem;line-height:1;padding:.6em 1em .4em;text-shadow:0 1px 0 rgba(255,255,255,.8)} -button:hover,input[type=button]:hover,input[type=reset]:hover,input[type=submit]:hover{border-color:#ccc #bbb #aaa;box-shadow:inset 0 1px 0 rgba(255,255,255,.8),inset 0 15px 17px rgba(255,255,255,.8),inset 0 -5px 12px rgba(0,0,0,.02)} -button:active,button:focus,input[type=button]:active,input[type=button]:focus,input[type=reset]:active,input[type=reset]:focus,input[type=submit]:active,input[type=submit]:focus{border-color:#aaa #bbb #bbb;box-shadow:inset 0 -1px 0 rgba(255,255,255,.5),inset 0 2px 5px rgba(0,0,0,.15)} -input[type=text],input[type=email],input[type=url],input[type=password],input[type=search],textarea{color:#666;border:1px solid #ccc;border-radius:3px} -input[type=text]:focus,input[type=email]:focus,input[type=url]:focus,input[type=password]:focus,input[type=search]:focus,textarea:focus{color:#111} -input[type=text],input[type=email],input[type=url],input[type=password],input[type=search]{padding:3px} -textarea{padding-left:3px;width:100%} -a:visited{color:purple} -a:active,a:focus,a:hover{color:#191970} -.main-navigation{clear:both;display:block;float:left;width:100%} -.main-navigation ul{display:none;list-style:none;margin:0;padding-left:0} -.main-navigation ul ul{box-shadow:0 3px 3px rgba(0,0,0,.2);float:left;position:absolute;top:1.5em;left:-999em;z-index:99999} -.main-navigation ul ul ul{left:-999em;top:0} -.main-navigation ul ul li.focus>ul,.main-navigation ul ul li:hover>ul{left:100%} -.main-navigation ul ul a{width:200px} -.main-navigation ul li.focus>ul,.main-navigation ul li:hover>ul{left:auto} -.main-navigation li{float:left;position:relative} -.main-navigation a{display:block;text-decoration:none} -.main-navigation.toggled ul,.menu-toggle{display:block} -@media screen and (min-width:37.5em){.menu-toggle{display:none} -.main-navigation ul{display:block} -} -.site-main .comment-navigation,.site-main .post-navigation,.site-main .posts-navigation{margin:0 0 1.5em;overflow:hidden} -.comment-navigation .nav-previous,.post-navigation .nav-previous,.posts-navigation .nav-previous{float:left;width:50%} -.comment-navigation .nav-next,.post-navigation .nav-next,.posts-navigation .nav-next{float:right;text-align:right;width:50%} -.gallery-item,.wp-caption-text{text-align:center} -.screen-reader-text{clip:rect(1px,1px,1px,1px);position:absolute!important;height:1px;width:1px} -.screen-reader-text:active,.screen-reader-text:focus,.screen-reader-text:hover{background-color:#f1f1f1;border-radius:3px;box-shadow:0 0 2px 2px rgba(0,0,0,.6);clip:auto!important;color:#21759b;display:block;font-size:14px;font-size:.875rem;font-weight:700;height:auto;left:5px;line-height:normal;padding:15px 23px 14px;text-decoration:none;top:5px;width:auto;z-index:100000} -.alignleft{display:inline;float:left;margin-right:1.5em} -.alignright{display:inline;float:right;margin-left:1.5em} -.btn-group>.btn-group,.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.dropdown-menu{float:left} -.aligncenter{display:block;margin-left:auto;margin-right:auto} -.hentry,.widget{margin:0 0 1.5em} -.clear:after,.clear:before,.comment-content:after,.comment-content:before,.entry-content:after,.entry-content:before,.site-content:after,.site-content:before,.site-footer:after,.site-footer:before,.site-header:after,.site-header:before{content:"";display:table} -.widget_search .search-submit{display:none} -.sticky{display:block} -.byline,.updated:not(.published){display:none} -.group-blog .byline,.single .byline{display:inline} -.entry-content,.entry-summary,.page-content{margin:1.5em 0 0} -.page-links{margin:0 0 1.5em} -.archive .format-aside .entry-title,.blog .format-aside .entry-title{display:none} -.bypostauthor{display:block} -.infinite-scroll .posts-navigation,.infinite-scroll.neverending .site-footer{display:none} -.infinity-end.neverending .site-footer{display:block} -.comment-content .wp-smiley,.entry-content .wp-smiley,.page-content .wp-smiley{border:none;margin-bottom:0;margin-top:0;padding:0} -hr,img{border:0} -.wp-caption{margin-bottom:1.5em} -.wp-caption img[class*=wp-image-]{display:block;margin-left:auto;margin-right:auto} -.wp-caption .wp-caption-text{margin:.8075em 0} -.gallery{margin-bottom:1.5em} -body,figure{margin:0} -.gallery-item{display:inline-block;vertical-align:top;width:100%} -.gallery-caption,article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block} -.label,sub,sup{vertical-align:baseline} -.btn,.btn-group,.btn-group-vertical,.caret,.checkbox-inline,.radio-inline,img{vertical-align:middle} -.gallery-columns-2 .gallery-item{max-width:50%} -.gallery-columns-3 .gallery-item{max-width:33.33%} -.gallery-columns-4 .gallery-item{max-width:25%} -.gallery-columns-5 .gallery-item{max-width:20%} -.gallery-columns-6 .gallery-item{max-width:16.66%} -.gallery-columns-7 .gallery-item{max-width:14.28%} -.gallery-columns-8 .gallery-item{max-width:12.5%} -.gallery-columns-9 .gallery-item{max-width:11.11%} /*! * Bootstrap v3.3.5 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ -html{box-sizing:border-box;font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;font-size:10px;-webkit-tap-highlight-color:transparent} +.label,sub,sup{vertical-align:baseline} +.btn,.btn-group,.btn-group-vertical,.caret,.checkbox-inline,.radio-inline,img{vertical-align:middle} +.sr-only,svg:not(:root){overflow:hidden} +hr,img{border:0} +body,figure{margin:0} +.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.pre-scrollable{max-height:340px} +.btn-group>.btn-group,.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.dropdown-menu{float:left} +.fa,.glyphicon{-moz-osx-font-smoothing:grayscale} +html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;font-size:10px;-webkit-tap-highlight-color:transparent} +article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block} audio,canvas,progress,video{display:inline-block;vertical-align:baseline} audio:not([controls]){display:none;height:0} [hidden],template{display:none} a{background-color:transparent} a:active,a:hover{outline:0} b,optgroup,strong{font-weight:700} +dfn{font-style:italic} h1{margin:.67em 0} mark{background:#ff0;color:#000} sub,sup{font-size:75%;line-height:0;position:relative} @@ -139,6 +39,7 @@ button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0} input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0} input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto} input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none} +table{border-collapse:collapse;border-spacing:0} td,th{padding:0} /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ @media print{blockquote,img,pre,tr{page-break-inside:avoid} @@ -496,6 +397,7 @@ dl{margin-bottom:20px} dd,dt{line-height:1.42857} dd{margin-left:0} .dl-horizontal dd:after,.dl-horizontal dd:before{content:" ";display:table} +.dl-horizontal dd:after{clear:both} @media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .dl-horizontal dd{margin-left:180px} } @@ -516,7 +418,7 @@ code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace} code{color:#c7254e;background-color:#f9f2f4;border-radius:4px} kbd{color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)} kbd kbd{padding:0;font-size:100%;box-shadow:none} -pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857;word-break:break-all;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px} +pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px} .container-fluid:after,.container-fluid:before,.container:after,.container:before,.row:after,.row:before{display:table;content:" "} .container,.container-fluid{margin-right:auto;margin-left:auto} pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;border-radius:0} diff --git a/gulpfile.js b/gulpfile.js index a6feb1c..1be40bd 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -50,5 +50,4 @@ gulp.task('copy-assets', function() { .pipe(gulp.dest('./js')); gulp.src('./bower_components/_s/js/*.js') .pipe(gulp.dest('./js')); - }); diff --git a/sass/theme.scss b/sass/theme.scss index bae10f6..f8ebbba 100644 --- a/sass/theme.scss +++ b/sass/theme.scss @@ -1,7 +1,7 @@ /***************************************************************** Import all needed 3rd party sass files plus your own style and variables -1. ../bower_components/_s/sass/style // Adding underscores default styles ake sure you run bower install before! <- Dont edit this files! +1. ../bower_components/_s/sass/style // Adding underscores default styles. Don´t needed if you use Bootstrap for styling -------------------------------------- 2. theme/theme_variables.scss // Overwriting Bootstrap variables and for own variables <-- ADD YOUR VARIABLES HERE -------------------------------------- @@ -28,8 +28,8 @@ Import all needed 3rd party sass files plus your own style and variables 6. theme/theme.scss"; // <-- ADD YOUR STYLES HERE ***************************************************************** */ -@import "../bower_components/_s/sass/style"; -@import "theme/theme_variables"; // <--------- Add your variables into this file. Also add variables to overwrite Bootstrap variables here +// @import "../bower_components/_s/sass/style"; +@import "theme/theme_variables"; // <--------- Add your variables into this file. Also add variables to overwrite Bootstrap or UnderStrap variables here @import "../bower_components/bootstrap-sass/assets/stylesheets/bootstrap"; @import "understrap/understrap"; @import "../bower_components/fontawesome/scss/font-awesome";