Browse Source

cssmin concat

windhamdavid 10 years ago
parent
commit
93d85f0549
5 changed files with 100 additions and 214 deletions
  1. 10 0
      css/style.min.css
  2. 77 195
      css/styles.css
  3. 4 5
      functions.php
  4. 1 1
      gruntfile.js
  5. 8 13
      style.css

File diff suppressed because it is too large
+ 10 - 0
css/style.min.css


+ 77 - 195
css/styles.css

@@ -1,18 +1,13 @@
 /*!
-* Theme Name: dw
-* Theme URI: http://davidawindham.com/
-* Author: windhamdavid
-* Author URI: http://davidawindham.com/
-* Description: Just a simple theme...
-* Tags: Bootstrap, Grunt, Infinite Scroll, Backbone.js, Underscore.js
-* Version: 2.0
-* License: GNU General Public License v2 or later
-* License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Theme Name: dw
+Theme URI: http://davidawindham.com/
+Author: windhamdavid
+Version: 2.0
 
-* Thanks: 
-* normalize.css v3.0.1 * MIT License | git.io/normalize
-* bootstrap v3.2.0 * Licensed under MIT | github.com/twbs/bootstrap
-* Automattic | _s github.com/Automattic/_s 
+Thanks: 
+normalize.css v3.0.1 * MIT License | git.io/normalize
+bootstrap v3.2.0 * Licensed under MIT | github.com/twbs/bootstrap
+Automattic | _s github.com/Automattic/_s 
 */
 
 html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,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: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:.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{-moz-box-sizing:content-box;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;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;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:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
@@ -35,6 +30,9 @@ a img {border: 0;}
 
 body {font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;font-size: 14px;line-height: 1.42857143;}
 input,button,select,textarea {font-family: inherit;font-size: inherit;line-height: inherit;}
+.glyphicon  {
+    font-size: 16px;
+}
 
 
 /*===== Structure =====*/
@@ -42,37 +40,20 @@ input,button,select,textarea {font-family: inherit;font-size: inherit;line-heigh
 .wrap {
   margin: 0 auto;
   width: 100%;
+  background: #fff;
 }
 
 
 /*===== Layouts =====*/
 
-.wrap {
-	background: #fff;
-	margin: 20px auto 30px;
-	padding: 0 40px;
-}
 
 
-/*===== Elements =====*/
 
-body {
-	background: rgba(160,160,160,0.73) url(img/3.png);
-}
-body,
-input,
-textarea {
-	color: #666;
-	font-size: 12px;
-	line-height: 18px;
-}
-hr {
-	background-color: #e7e7e7;
-	border: 0;
-	clear: both;
-	height: 1px;
-	margin-bottom: 18px;
-}
+/*===== Body =====*/
+
+body { background: rgba(242,242,242,.7) }
+body,input,textarea {color: #666;font-size: 12px;line-height: 18px;}
+hr {background-color: #e7e7e7;border: 0;clear: both;height: 1px;margin-bottom: 18px;}
 p {
 	margin-bottom: 18px;
 	text-indent : 35px;
@@ -144,9 +125,8 @@ pre {
 	margin-bottom: 18px;
 	padding: 1.5em;
 }
-abbr,
-acronym {
-	border-bottom: 1px dotted #666;
+abbr,acronym {
+border-bottom: 1px dotted #666;
 	cursor: help;
 }
 sup,
@@ -179,27 +159,26 @@ a:visited {
 	color: #251a86;
 	text-decoration: none;
 }
-a:active,
-a:hover {
-	color: #757576;
-	text-decoration: none;
-}
+a:active, a:hover { color: #757576; text-decoration: none;}
 
 
 /*===== Header =====*/
 
-header {
+#header {
 	padding: 50px 0 0 0;
 }
-#site-title {
-	float: right;
-	margin: 0 0 5px 0;
+.site-title {
+	float: left;
 	font: 21px/27px "Courier New", Courier, mono;
 }
-#site-title a {
+.site-title a {
 	color: #000;
 	text-decoration: none;
 }
+img.dw {
+	float: right;
+	margin: 15px 0;
+}
 #site-description {
 	clear: right;
 	float: right;
@@ -211,104 +190,25 @@ header {
 
 /*==== Nav =====*/
 
-#access {
-	background: #fff;
-	display: block;
-	float: left;
-	margin: 0 auto;
-	width: 940px;
-	border-top: 1px solid #999;
-}
-.subnav {
-	float: left;
-	margin: 0px 10px 0 400px;
-	font-family: "Helvetica Neue", Arial, Helvetica, "Nimbus Sans L", sans-serif;
-}
-.subnav ul {
-	list-style: none;
-	float: right;
-	width: 220px;
-}
-.subnav ul a {
-	float: left;
-	margin: 0 5px;
-}
-#access .menu-header,
-div.menu {
-	font-size: 13px;
-	margin-left: 12px;
-	width: 928px;
-}
-#access .menu-header ul,
-div.menu ul {
-	list-style: none;
-	margin: 0;
-}
-#access .menu-header li,
-div.menu li {
-	float: right;
-	position: relative;
-}
-#access a {
-	color: #aaa;
-	display: block;
-	line-height: 38px;
-	padding: 0 10px;
-	text-decoration: none;
-}
-#access ul ul {
-	box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
-	-moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
-	-webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
-	display: none;
-	position: absolute;
-	top: 38px;
-	left: 0;
-	float: left;
-	width: 180px;
-	z-index: 99999;
-}
-#access ul ul li {
-	min-width: 180px;
+.navbar {
+  background-color: rgba(237, 237, 237, 0.7);
 }
-#access ul ul ul {
-	left: 100%;
-	top: 0;
-}
-#access ul ul a {
-	background: #333;
-	line-height: 1em;
-	padding: 10px;
-	width: 160px;
-	height: auto;
-}
-#access li:hover > a,
-#access ul ul :hover > a {
-	background: #transparent;
-	color: #555;
-}
-#access ul li:hover > ul {
-	display: block;
-}
-#access ul li.current_page_item > a,
-#access ul li.current-menu-ancestor > a,
-#access ul li.current-menu-item > a,
-#access ul li.current-menu-parent > a {
-	color: #000;
-}
-* html #access ul li.current_page_item a,
-* html #access ul li.current-menu-ancestor a,
-* html #access ul li.current-menu-item a,
-* html #access ul li.current-menu-parent a,
-* html #access ul li a:hover {
-	color: #fff;
+
+.navbar-center
+{
+    position: absolute;
+    width: 100%;
+    left: 0;
+    top: 0;
+    text-align: center;
+    margin: auto;
+  height:100%;
 }
 
-.navbar-custom {
+.navbar {
   -webkit-transition: background-color 0.3s;
   -moz-transition: background-color 0.3s;
   transition: background-color 0.3s;
-  /* Force Hardware Acceleration in WebKit */
   -webkit-transform: translate3d(0, 0, 0);
   -moz-transform: translate3d(0, 0, 0);
   -ms-transform: translate3d(0, 0, 0);
@@ -317,32 +217,16 @@ div.menu li {
   -webkit-backface-visibility: hidden;
   backface-visibility: hidden;
 }
-.navbar-custom.is-fixed {
-  /* when the user scrolls down, we hide the header right above the viewport */
+.navbar.fixed {
   position: fixed;
   top: -61px;
-  background-color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(255, 255, 255, 0.7);
   border-bottom: 1px solid #f2f2f2;
   -webkit-transition: -webkit-transform 0.3s;
   -moz-transition: -moz-transform 0.3s;
   transition: transform 0.3s;
 }
-.navbar-custom.is-fixed .navbar-brand {
-  color: #404040;
-}
-.navbar-custom.is-fixed .navbar-brand:hover,
-.navbar-custom.is-fixed .navbar-brand:focus {
-  color: #0085a1;
-}
-.navbar-custom.is-fixed .nav li a {
-  color: #404040;
-}
-.navbar-custom.is-fixed .nav li a:hover,
-.navbar-custom.is-fixed .nav li a:focus {
-  color: #0085a1;
-}
-.navbar-custom.is-visible {
-  /* if the user changes the scrolling direction, we show the header */
+.navbar.visible {
   -webkit-transform: translate3d(0, 100%, 0);
   -moz-transform: translate3d(0, 100%, 0);
   -ms-transform: translate3d(0, 100%, 0);
@@ -350,13 +234,41 @@ div.menu li {
   transform: translate3d(0, 100%, 0);
 }
 
+.navmenu,
+.navbar-offcanvas {
+  width: 300px;
+  height: auto;
+  border-style: solid;
+  border-width: 1px;
+  border-radius: 4px;
+}
+.navmenu-fixed-right,
+.navbar-offcanvas {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  z-index: 1030;
+  overflow-y: auto;
+  border-radius: 0;
+  background-color: rgba(237, 237, 237, 0.7);
+}
+.navmenu-fixed-left,
+.navbar-offcanvas.navmenu-fixed-left {
+  right: auto;
+  left: 0;
+  border-width: 0 1px 0 0;
+}
+.navmenu-fixed-right,
+.navbar-offcanvas {
+  right: 0;
+  left: auto;
+  border-width: 0 0 0 1px;
+}
+
+
 /*===== Content =====*/
 
-#main {
-	clear: both;
-	overflow: hidden;
-	padding: 10px 0 0 0;
-}
+
 #content {
 	margin-bottom: 36px;
 }
@@ -1146,34 +1058,4 @@ p.cc {
 }
 span.quiet {
 	display: none;
-}
-img.dw {
-	float: right;
-	margin: 0;
-}
-
-
-/*==== Accessibility ======*/
-.screen-reader-text {
-	position: absolute;
-	left: -9000px;
-}
-.sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  margin: -1px;
-  padding: 0;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0;
-}
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
-  position: static;
-  width: auto;
-  height: auto;
-  margin: 0;
-  overflow: visible;
-  clip: auto;
 }

+ 4 - 5
functions.php

@@ -17,13 +17,12 @@ add_image_size( 'post-large', 770, 577, true );
 
 function dw_scripts() {
 	global $post;
-	wp_enqueue_style( 'style', get_stylesheet_uri() );
-	wp_enqueue_style( 'boot', get_template_directory_uri() . '/css/bootstrap.css');
-	wp_enqueue_style( 'jasny', get_template_directory_uri() . '/css/jasny-bootstrap.css');
+	//wp_enqueue_style( 'style', get_stylesheet_uri() );
+	wp_enqueue_style( 'style', get_template_directory_uri() . '/css/style.min.css');
+	//wp_enqueue_style( 'boot', get_template_directory_uri() . '/css/bootstrap.css');
+	//wp_enqueue_style( 'jasny', get_template_directory_uri() . '/css/jasny-bootstrap.css');
 	wp_deregister_script('jquery');
 	wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
-	wp_enqueue_script('boot', get_template_directory_uri() . '/js/bootstrap.min.js', array(), false, true);
-	wp_enqueue_script('jasny', get_template_directory_uri() . '/js/jasny-canvas.js', array(), false, true);
 	wp_enqueue_script( 'script', get_template_directory_uri() . '/js/script.js', 'jquery', '', true );
 	wp_enqueue_script( 'init', get_template_directory_uri() . '/js/init.js', 'jquery', '', true );
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {

+ 1 - 1
gruntfile.js

@@ -12,7 +12,7 @@ module.exports = function(grunt) {
 		cssmin: {
 		  combine: {
 		    files: {
-		      'style.min.css': ['css/styles.css', 'css/bootstrap.css', 'css/jasny-bootstrap.css', ]
+		      'css/style.min.css': ['css/styles.css', 'css/bootstrap.css', 'css/jasny-bootstrap.css', ]
 		    }
 		  }
 		},

+ 8 - 13
style.css

@@ -1,20 +1,15 @@
 /* @override http://macs.local/david/wp-content/themes/dw/style.css */
 
 /*!
-* Theme Name: dw
-* Theme URI: http://davidawindham.com/
-* Author: windhamdavid
-* Author URI: http://davidawindham.com/
-* Description: Just a simple theme...
-* Tags: Bootstrap, Grunt, Infinite Scroll, Backbone.js, Underscore.js
-* Version: 2.0
-* License: GNU General Public License v2 or later
-* License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Theme Name: dw
+Theme URI: http://davidawindham.com/
+Author: windhamdavid
+Version: 2.0
 
-* Thanks: 
-* normalize.css v3.0.1 * MIT License | git.io/normalize
-* bootstrap v3.2.0 * Licensed under MIT | github.com/twbs/bootstrap
-* Automattic | _s github.com/Automattic/_s 
+Thanks: 
+normalize.css v3.0.1 * MIT License | git.io/normalize
+bootstrap v3.2.0 * Licensed under MIT | github.com/twbs/bootstrap
+Automattic | _s github.com/Automattic/_s 
 */
 
 html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,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: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:.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{-moz-box-sizing:content-box;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;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;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:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}

Some files were not shown because too many files changed in this diff