X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=amelia%2Fbootswatch.less;h=e8bdc88761defedde2c8795a0936bca8a0255925;hb=48c64127b37be4a692a70cb7b38ed9744163582b;hp=4aac7297ee8ac5cca9dc75d3bd363cf7780ecd9b;hpb=150ec4fa347d39a5859cb98d049674bb7c693781;p=bootswatch

diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
old mode 100755
new mode 100644
index 4aac729..e8bdc88
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -1,726 +1,139 @@
-// Amelia 2.2.2
+// Amelia 3.0.1
 // Bootswatch
 // -----------------------------------------------------
 
+@import url("//fonts.googleapis.com/css?family=Lobster|Cabin:400,700");
 
-// TYPOGRAPHY
-// -----------------------------------------------------
-
-@import url('https://fonts.googleapis.com/css?family=Lobster');
-@import url('https://fonts.googleapis.com/css?family=Cabin:400,700');
-
-h6 {
-	color: @textColor;
-}
-
-h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-	font-family: @baseFontFamily;
-	color: @textColor;
-}
-
-code, pre {
-	background-color: rgba(255, 255, 255, 0.3);
-	padding: 2px;
-}
-
-blockquote {
-
-	border-left-color: lighten(#147E88, 12%);
-
-	&.pull-right {
-		border-right-color: lighten(#147E88, 12%);
-	}
-
-	small {
-		color: rgba(255, 255, 255, 0.6);
-	}
-}
-
-.muted {
-	color: rgba(255, 255, 255, 0.5);
-}
-
-// SCAFFOLDING
-// -----------------------------------------------------
-
-body {
-	#gradient > .radial(lighten(#0F8790, 7%), #0F8790);
-}
-
-hr {
-	border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-}
-
-.page-header {
-	margin: 30px 0 15px;
-	border-bottom: 0px solid transparent;
-}
-
-// NAVBAR
-// -----------------------------------------------------
+// Navbar =====================================================================
 
 .navbar {
 
-	.navbar-inner {
-		.border-radius(0);
-	}
-
-	.brand {
-		padding: 15px 20px 14px;
-		font-family: @headingsFontFamily;
-		font-size: 24px;
-		font-weight: normal;
-	}
-
-	.nav > li > a {
-		padding-top: 17px;
-		padding-bottom: 14px;
-		text-shadow: none;
-	}
-
-	.nav > .active > a,
-	.nav > .active > a:hover,
-	.navbar .nav > .active > a:focus {
-		.box-shadow(none);
-	}
-
-	.navbar-search {
-		margin-top: 10px;
-	}
-
-	.navbar-search .search-query {
-		.border-radius(0);
-		padding-top: 5px;
-		padding-bottom: 5px;
-	}
-
-	.navbar-text {
-		margin: 17px 15px 14px;
-		line-height: 20px;
-	}
-
-	.btn,
-	.btn-group {
-		padding: 4px;
-	}
-
-	&-inverse {
-
-		.dropdown-menu li > a:hover,
-		.dropdown-menu li > a:focus,
-		.dropdown-submenu:hover > a {
-			background-image: none;
-			background-color: @yellow;
-		}
+	&-brand {
+		font-family: 'Lobster', cursive;
 	}
 }
 
-@media (max-width: @navbarCollapseWidth) {
-
-	.navbar .nav-collapse {
-
-		.nav li > a {
-
-			color: @textColor;
-			.border-radius(0);
-
-			&:hover {
-				background-color: lighten(@navbarBackground, 10%);
-			}
-		}
-
-		.dropdown-menu li > a:hover,
-		.dropdown-menu li > a:focus,
-		.dropdown-submenu:hover > a {
-			background-image: none;
-		}
+// Buttons ====================================================================
 
-		.navbar-form,
-		.navbar-search {
-			.box-shadow(none);
-			border: none;
-		}
-
-		.navbar-search .search-query {
-			border: 2px solid @textColor;
-		}
-
-		.nav-header {
-			color: rgba(255, 255, 255, 0.5);
-		}
-	}
-
-	.navbar-inverse .nav-collapse {
-
-		.nav li > a:hover,
-		.dropdown-menu a:hover {
-			background-color: lighten(@navbarInverseBackground, 10%) !important;
-		}
+.btn {
+	
+	.caret {
+		border-top-color: #fff;
 	}
 }
 
-div.subnav {
+.btn-default {
 
-	background-color: rgba(42, 99, 105, 0.9);
-	background-image: none;
-	border: 0px solid transparent;
-	.border-radius(0);
-	.box-shadow(none);
-
-	.nav > li.open > a {
-		border-color: transparent;
-		background-color: rgba(255, 255, 255, 0.4);
-	}
-
-	.nav > li > a {
-		color: @textColor;
-		border-color: transparent;
-	}
-
-	.nav > li:first-child > a,
-	.nav > li:first-child > a:hover {
-		.border-radius(0);
-	}
-
-	.nav > .active > a {
-		background-color: transparent;
-		border-color: transparent;
-		color: @textColor;
-		.box-shadow(none);
+	&:hover {
+		color: @btn-default-color;
 	}
 
-	.nav > .active > a:hover,
-	.nav > li > a:hover,
-	.nav > li.active > a:hover, {
-		border-right-color: transparent;
-		background-color: rgba(255, 255, 255, 0.4);
-		color: @textColor;
-	}
-
-	.nav > li:first-child > a:hover {
-		border-left-color: rgba(255, 255, 255, 0.4);
-		border-left-width: 1px;
-	}
-
-	&-fixed {
-		top: 50px;
+	.caret {
+		border-top-color: @btn-default-color;
 	}
 }
 
-// NAV
-// -----------------------------------------------------
+// Typography =================================================================
 
-.nav-tabs li.open > .dropdown-toggle,
-.nav-pills li.open > .dropdown-toggle {
-	background-color: #8AD5DC;
-	color: @linkColor;
-	border-color: transparent;
+.text-primary {
+	color: lighten(@brand-primary, 40%);
 }
 
-.nav-tabs, .nav-pills {
-	border-color: transparent;
-
-	li > a {
-		border-color: transparent;
-		.border-radius(0);
-		.box-shadow(0);
-	}
-
-	li.active > a,
-	li:active > a,
-	li.active > a:hover,
-	li:active > a:hover {
-		color: @textColor;
-	}
-
-	li.active > a,
-	li:active > a,
-	li > a:hover,
-	li.active > a:hover,
-	li:active > a:hover {
-		background-color: #8AD5DC;
-		border-color: transparent;
-		text-shadow: none;
-	}
+.text-success {
+	color: lighten(@brand-success, 20%);
 }
 
-.nav-tabs, .nav-tabs > li > a {
-	border-bottom: 1px solid rgba(255, 255, 255, 0.5);
+.text-danger {
+	color: lighten(@brand-danger, 20%);
 }
 
-.nav-tabs > li > a {
-	background-color: #3CB9C6;
+.text-warning {
+	color: lighten(@brand-warning, 20%);
 }
 
-.nav-tabs.nav-stacked {
-
-	li > a:first-child,
-	li > a:last-child {
-		.border-radius(0);
-	}
-
-	li > a,
-	li > a:hover,
-	li.active > a,
-	li:active > a,
-	li.active > a:hover,
-	li:active > a:hover {
-		border-color: transparent;
-	}
+.text-info {
+	color: lighten(@brand-info, 40%);
 }
 
-.nav-list {
-	.nav-header {
-		text-shadow: none;
-		color: @textColor;
-	}
-
-	li > a {
-		text-shadow: none;
-	}
-
-	li.active > a,
-	li:active > a,
-	li > a:hover,
-	li.active > a:hover,
-	li:active > a:hover {
-		background-color: #8AD5DC;
-		text-shadow: none;
-	}
-
-	.divider {
-		background-color: rgba(255, 255, 255, 0.3);
-		border-bottom: none;
-	}
-}
+// Tables =====================================================================
 
-.breadcrumb, .pager > li > a {
-	border-color: transparent;
-	.border-radius(0);
-	.box-shadow(none);
-	text-shadow: none;
+.table-responsive > .table {
+	background-color: @table-bg;
 }
 
-.breadcrumb {
-	background-color: #3CB9C6;
-	background-image: none;
-
-	li {
-		text-shadow: none;
-	}
+// Forms ======================================================================
 
-	.active {
-		color: @white;
+.has-warning {
+	.help-block,
+	.control-label {
+		color: lighten(@brand-warning, 20%);
 	}
 
-	.divider {
-		color: @linkColor;
+	.form-control,
+	.form-control:focus {
+		border-color: lighten(@brand-warning, 20%);
 	}
 }
 
-.pagination {
-
-	ul  {
-		background-color: @paginationBackground;
-		background-image: none;
-		.border-radius(0);
-	}
-
-	ul > li > a:hover {
-		background-color: rgba(255, 255, 255, 0.4);
-		color: @linkColor;
-	}
-
-	ul > li:first-child > a,
-	ul > li:last-child > a {
-		.border-radius(0);
+.has-error {
+	.help-block,
+	.control-label {
+		color: lighten(@brand-primary, 40%);
 	}
 
-	ul > .disabled > a,
-	ul > .disabled > a:hover,
-	ul > .disabled > span,
-	ul > .disabled > span:hover {
-		color: @textColor;
-	}
-
-	ul > .active > a,
-	ul > .active > a:hover,
-	ul > .active > span,
-	ul > .active > span:hover {
-		background-color: rgba(255, 255, 255, 0.4);
-		color: @textColor;
+	.form-control,
+	.form-control:focus {
+		border-color: lighten(@brand-primary, 40%);
 	}
 }
 
-.pager {
-
-	li > a {
-		background-color: #3CB9C6;
-
-		&:hover {
-			background-color: #8AD5DC;
-		}
+.has-success {
+	.help-block,
+	.control-label {
+		color: lighten(@brand-success, 20%);
 	}
 
-	.disabled a,
-	.disabled a:hover {
-		background-color: #3CB9C6;
-		color: @white;
+	.form-control,
+	.form-control:focus {
+		border-color: lighten(@brand-success, 20%);
 	}
 }
 
-// BUTTONS
-// -----------------------------------------------------
-
-.buttonBackgroundCustom(@color) {
-
-  background-color: @color;
-  border-color: transparent;
-
-  &:hover, &:active, &.active, &.disabled, &[disabled] {
-    background-color: darken(@color, 5%);
-	text-shadow: none;
-  }
-
-  &:active, &.active {
-    background-color: darken(@color, 15%);
-	.box-shadow(none);
-  }
-
-  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
-  &:active,
-  &.active {
-    background-color: darken(@color, 15%) e("\9");
-  }
-}
-
-.btn {
- 	padding: 12px 16px;
-	.border-radius(0);
-	background-image: none;
-	text-shadow: none;
-	.box-shadow(none);
-	.buttonBackgroundCustom(@btnBackground)
-}
-
-.btn-group .btn:first-child {
-	margin-left: 0;
-	.border-radius(0);
-}
-
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle {
-     .border-radius(0);
-}
-
-.btn-group .dropdown-toggle,
-.btn-group.open .dropdown-toggle,
-.btn.open .dropdown-toggle {
-	.box-shadow(none);
-}
-
-.btn-primary {
-  .buttonBackgroundCustom(@btnPrimaryBackground);
-}
-
-.btn-info {
-  .buttonBackgroundCustom(@btnInfoBackground);
-}
-
-.btn-success {
-  .buttonBackgroundCustom(@btnSuccessBackground);
-}
-
-.btn-warning {
-  .buttonBackgroundCustom(@btnWarningBackground);
-}
-
-.btn-danger {
-  .buttonBackgroundCustom(@btnDangerBackground);
-}
-
-.btn-inverse {
-  .buttonBackgroundCustom(@btnInverseBackground);
-}
-
-.btn-link {
-	.buttonBackgroundCustom(@btnPrimaryBackground);
-}
-
-[class^="icon-"], [class*=" icon-"] {
-	margin-top: 2px;
-	margin-right: 8px;
-}
-
-.btn-small [class^="icon-"] {
-	margin-top: 1px;
-}
-
-.add-on [class^="icon-"] {
-	margin-left: 5px;
-}
-
-// TABLES
-// -----------------------------------------------------
-
-.table th, .table td,
-.table tbody + tbody {
-	border-top: 0px solid transparent;
-}
-
-.table-bordered {
-	.border-radius(0);
-}
-
-.table tbody {
-
-	tr.success td {
-		background-color: @green;
-	}
-
-	tr.error td {
-		background-color: @red;
-	}
-
-	tr.info td {
-		background-color: @blue;
-	}
-}
-
-// FORMS
-// -----------------------------------------------------
-
 legend {
-	font-family: @headingsFontFamily;
-}
-
-legend, label, .help-block, .input-file {
-	color: @textColor;
-	border: 0px solid transparent;
+	font-family: 'Lobster', cursive;
+	color: #fff;
 }
 
-input, textarea, .uneditable-input {
-	border: 0px solid transparent;
-	padding: 10px;
+.input-group-addon {
+	color: @btn-default-color;
 }
 
-.uneditable-input {
-	padding-bottom: 30px;
-}
-
-select {
-	border: 0px solid transparent;
-}
-
-button {
-	margin-left: 12px;
-}
-
-input, textarea, .search-query, .uneditable-input,
-.input-append input, .input-append .uneditable-input,
-.input-prepend input, .input-prepend .uneditable-input {
-	border-color: transparent;
-	.box-shadow(none);
-}
+// Navs =======================================================================
 
-.form-actions {
-	border-top: 0px solid transparent;
-}
-
-.control-group.warning > label,
-.control-group.warning .help-inline {
-	color: lighten(@orange, 30%);
-}
-
-.control-group.error > label,
-.control-group.error .help-inline {
-	color: lighten(@linkColor, 10%);
-}
-
-.control-group.success > label,
-.control-group.success .help-inline {
-	color: lighten(@green, 20%);
-}
-
-.input-prepend .add-on,
-.input-append .add-on {
-	height: 20px;
-	padding-top: 4px;
-	background-color: @grayLighter;
-	border-color: transparent;
-	.border-radius(0);
-	color: @gray;
-	text-shadow: none;
-}
-
-.input-append .btn,
-.input-prepend .btn {
-	padding: 4px 10px;
-}
-
-// ALERTS, LABELS, BADGES
-// -----------------------------------------------------
-
-.alert, .label {
-	border-color: transparent;
-	.border-radius(0);
-	.box-shadow(none);
-	text-shadow: none;
-}
-
-.alert-heading {
-	color: @textColor;
-}
-
-.label, .label:hover {
-	background-color: @grayLighter;
-	text-shadow: none;
-	color: @grayDark;
-}
-
-.label-warning, .label-warning:hover, .alert {
-	background-color: @orange;
-	color: @textColor;
-}
-
-.label-important, .label-important:hover, .alert-error {
-	background-color: darken(@yellow, 3%);
-	color: @textColor;
-}
-
-.label-success, .label-success:hover, .alert-success {
-	background-color: @green;
-	color: @textColor;
-}
-
-.label-info, .label-info:hover, .alert-info {
-	background-color: @purple;
-	color: @textColor;
-}
-
-// MISCELLANEOUS
-// -----------------------------------------------------
-
-.progress, .well, pre, code {
-	border-color: transparent;
-	.border-radius(0);
-	.box-shadow(none);
-	text-shadow: none;
-}
-
-.well {
-	background-image: none;
-}
-
-.hero-unit {
-	.border-radius(0);
-}
-
-.thumbnail {
-	border: 0 solid transparent;
-	.border-radius(0);
-	.box-shadow(none);
-}
-
-.progress {
-
-	background-image: none;
-	background-color: #27666D;
-
-	.bar {
-
-		.box-shadow(none);
-		background-image: none;
-		background-color: @yellow;
-
-		&-success {
-			background-color: @green;
-		}
-
-		&-warning {
-			background-color: @orange;
-		}
+.pagination {
 
-		&-error {
-			background-color: @red;
-		}
+	a:hover {
+		color: #fff;
 	}
 }
 
-.progress-danger .bar {
-	background-image: none;
-	background-color: #AD1D28;
-}
-
-.progress-danger.progress-striped .bar {
-	#gradient > .striped(#AD1D28);
-}
-
-.progress-success .bar {
-	background-image: none;
-	background-color: @green;
-}
-
-.progress-success.progress-striped .bar {
-	#gradient > .striped(@green);
-}
-
-.progress-info .bar {
-	background-image: none;
-	background-color: @blue;
-}
+.pager {
 
-.progress-info.progress-striped .bar {
-	#gradient > .striped(@blue);
+	a:hover {
+		color: #fff;
+	}
 }
 
-.modal {
+// Indicators =================================================================
 
-	.border-radius(0);
+// Progress bars ==============================================================
 
-	&-header {
-		background-color: @navbarBackground;
-		color: @white;
-	}
+// Containers =================================================================
 
-	&-body {
-		
-		color: @grayDark;
-
-		h1, h2, h3, h4, h5, h6,
-		legend {
-			color: @red;
-		}
-
-		label,
-		.input-file {
-			color: @grayDark;
-		}
-
-		.help-block,
-		.help-inline {
-			color: @grayLight;
-		}
-
-		textarea,
-		input,
-		.uneditable-input {
-			border: 1px solid @grayLight;
-		}
-	}
+.list-group-item {
+	background-color: lighten(@body-bg, 5%);
 }
 
 .popover {
-	
-	padding: 0;
-	.border-radius(0);
-	color: @grayDark;
-
-	.popover-title {
-		.border-radius(0);
-		color: @white;
-	}
+	color: @gray-dark;
 }
-
-// MEDIA QUERIES
-// -----------------------------------------------------