jap_mag 0.0.4 → 0.0.5

data/app/assets/stylesheets/jap_mag/mixins.scss

@@ -4,107 +4,8 @@
   -webkit-border-radius: $radius;
 }
 
-@mixin columns($count: 2, $gap: 60px) {
-  -moz-column-count: $count;
-  -webkit-column-count: $count;
-  column-count: $count;
-  -moz-column-gap: $gap;
-  -webkit-column-gap: $gap;
-  column-gap: $gap;
-}
-
-@mixin rotate($degrees) {
-  -webkit-transform: rotate(#{$degrees}deg);
-  -moz-transform: rotate(#{$degrees}deg);
-  -ms-transform: rotate(#{$degrees}deg);
-  -o-transform: rotate(#{$degrees}deg);
-  transform: rotate(#{$degrees}deg);
-
-  filter:  progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=#{cos($degrees)}, M12=-#{sin($degrees)}, M21=#{sin($degrees)}, M22=#{cos($degrees)});
-  -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=#{cos($degrees)}, M12=-#{sin($degrees)}, M21=#{sin($degrees)}, M22=#{cos($degrees)})";
-  zoom: 1;
-}
-
 @mixin box-shadow($effect: 1px 0px 5px black) {
 	box-shadow: $effect;
 	-moz-box-shadow: $effect;
 	-webkit-box-shadow: $effect;
-}
-
-@mixin iphone_base {
-	html {
-		-webkit-text-size-adjust: none;
-	}
-
-	body {
-		font-size: 14px;
-	}
-	
-	#wrapper {
-		padding: 0;
-	}
-	
-	#body {
-		.primary {
-			margin: 0 0 10px 0;
-		}
-	}
-	
-	form.basic {	
-		input[type=text], input[type=email], input[type=password], textarea {
-			width: 95%;
-		}
-	}
-	
-	#error_explanation {
-		width: auto;
-	}
-}
-
-@mixin set_width($base_width) {
-	#wrapper {
-		width: $base_width !important;
-		
-		.gutter {
-			width: $base_width - 20px;
-		}
-	}
-}
-
-/* iPhone 2G, 3G, 3GS, 4, 4S, 5 Portrait */
-@mixin iphone_portrait {
-	@media only screen and (min-device-width: 320px) and (max-device-width: 480px) and (orientation: portrait) {
-		@include set_width(320px);
-		@content;
-	}
-}
-
-/* iPhone 2G, 3G, 3GS, 4, 4S Landscape */
-@mixin iphone_4s_landscape {
-	@media only screen and (min-device-width: 320px) and (max-device-width: 480px) and (orientation: landscape) {
-		@include set_width(480px);
-		@content;
-	}
-}
-
-/* iPhone 5 Landscape */
-@mixin iphone_5_landscape {
-	@media only screen and (width: 568px) and (orientation: landscape) {
-		@include set_width(568px);
-		@content;
-	}
-}
-
-/* all iPhone */
-@mixin iphone_portrait_and_landscape {
-	@include iphone_portrait {@content};
-	@include iphone_4s_landscape {@content};
-	@include iphone_5_landscape {@content};
-}
-
-/* Desktop, say, 960px width */
-@mixin desktop {
-	@media only screen and (min-width: 768px) {
-		@content;
-	}
 }

data/app/assets/stylesheets/jap_mag/widgets.scss

@@ -1,17 +1,10 @@
-@import "mixins";
-@import "variables";
+.hidden {
+  display: none;
+}
 
 .widget {
 	margin-bottom: 30px;
 	overflow: hidden;
-
-	li {
-		margin: 10px 0;
-	}
-
-	.more {
-		font-size: 14px;
-	}
 }
 
 div.pagination {
@@ -30,7 +23,7 @@ div.pagination {
 	}
 }
 
-#flash {	
+#flash {
 	div {
 		margin: 10px auto;
 		color: white;
@@ -39,11 +32,11 @@ div.pagination {
 	}
 
 	.notice {
-		background: $color_green;
+		background: #53a440;
 	}
 
 	.warning {
-		background: $color_yellow;
+		background: fc9729;
 	}
 
 	.error {
@@ -66,417 +59,12 @@ div.pagination {
 	}
 }
 
-table.basic {
-	border: none;
-	border-collapse: collapse;
-	border-spacing: 0;
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	word-break: break-all;
-
-	td, & th {
-		margin: 0;
-		padding: 10px;
-	}
-
-	th {
-		background-color: #eee;
-		border-top: 2px solid #ccc;
-		border-bottom: 1px solid #ccc;
-	}
-
-	td {
-		border-top: 1px solid #ccc;
-
-		&.actions a {
-			margin-right: 10px;
-		}
-
-		&.field {
-			background: #eee;
-		}
-	}
-
-	tr:last-child {
-		border-bottom: 1px solid #ccc;
-	}
-	
-	.ok {
-		background: $color_even_lighter_green;
-	}
-	
-	.bad {
-		background: $color_light_pink;
-	}
-}
-
-/* call to action*/
-.cta {
-	background: $color_blue;
-	color: #fff;
-	border: none;
-	font-weight: bold;
-	display: inline-block;
-
-	span {
-		padding: 5px 10px;
-		display: block;
-	}
-
-	&:hover {
-		background: $color_body;
-	}
-}
-
-/* rating stars */
-.rating {
-	background: url(data:image/gif;base64,R0lGODlhEAAwAOYAAKE3N8XFxemzG8yADefCWtSEhNBzc97e3uSvr8BgYOO4Q/fsvMVSUtbW1uK2NOS9Zvb29urLRtqpqe7u7t2oKfHcmt66uuzPea1GRvfp6ey8Iu3CMOnGQevNmc1sbPbhYvTf3/TZWvHOU+fn58daWtmdJc97e9eSkvfrtb9CQsJKSt+vMefEcuzHx+nHTO/FKe/VTPz47+a9QvLVWMxmZszMzPv12Pv15ua/OeiwJfHbot2qRfHcf71KStOPIqo/P+S7Su7DS+WtOO3Sq////9iMjNN8fPTWQOrJgfHNL/LQRfXeXemzIPnu7vLWVe3QWu7DQdGLGenHbu3Ly+/IT+W2OO3OSe+9Ke/OKeq1K961MclgYOu9RO+1QvLcV/DLOffenOi6uuvOh9uUlOy/SLRMTNaZK/LfsLhERPfWSv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEHAGoALAAAAAAQADAAAAf/gGqCg2oQE4SIiA0NiY0TiyONiouMkoIjDQcHmYkTmoublKAjEJuan6KpaqCiNa41izVEgqyxrrEQhK2vDTW5hJi9vJyIoa2LicapNYmUNZqvzIiukYMjNQGdkoeWIFOWiAY04IMtNDQI5Go0BgYk5Ag0RkZbRYktYwZbNCYeW+4MaBRAkKGfgXlGPDBgQMKDPxIMVKhxWIAGCYgRVaigEbGJoHNGMGpMwVGFx0H/SqpIQTJFBkQS/mlcedFEoiLnGOyLSCJBIgMe2l08R6JMooYMUhQ4gQYNgx+JNI4hJAEDgERhJFkAZ2OBOkFPInxdYMVKBXURnDjBQQ6MlRAhjDhcSISCxxMOb5V8EYHDARApOm48geFliWElL15soBKES5UVK9SIgPHhSJIkiTVoYMJFyIoYglxYWXL5hWYBZIRQAD1IxgzEpgUI4ELhBqIKHGaY1iCgSpUHiS5EiLABCpQsOarsSESAiggqMqpwcWwmkQIqVSiwQFKihJAoiSCLIdTBx4BEZyQNGRQIADs=) repeat-x 0 -32px;
-	height: 16px;
-
-	span {
-		display: none;
-	}
-
-	&.rating-1 {
-		width: 16px;
-	}
-
-	&.rating-2 {
-		width: 32px;
-	}
-
-	&.rating-3 {
-		width: 48px;
-	}
-
-	&.rating-4 {
-		width: 64px;
-	}
-
-	&.rating-5 {
-		width: 80px;
-	}
-}
-
-
-/* @group ul.tabs */
-div.tab {
-	clear: both;
-	margin-bottom: 10px;
-	overflow: hidden;
-	width: 100%;
-	border: none;
-
-	ul.tab {
-		border-bottom: 1px solid #CCC;
-		padding-left: 16px;
-		zoom: 1;
-		margin: 0px;
-		padding: 0.2em 0.2em 0px;
-		position: relative;
-		border: none;
-		border-bottom: 1px solid #CCC;
-
-		&:after {
-			display: block;
-			height: 0;
-			clear: both;
-		}
-
-		li {
-			border: solid 1px #CCC;
-			border-bottom: 0;
-			float: left;
-			list-style: none;
-			margin: 0px 5px 1px 0px;
-			padding: 0px;
-			position: relative;
-			top: 1px;
-			white-space: nowrap;
-			border-radius: 0;
-
-			&.current {
-				margin-bottom: 0px;
-				padding-bottom: 1px;
-				background: white;
-
-				a {
-					color: #000;
-
-					&:hover {
-						background: transparent;
-					}
-				}
-			}
-
-			a {
-				float: left;
-				padding: 3px 13px;
-				text-decoration: none;
-				cursor: pointer;
-			}
-		}
-	}
-
-	.ui-tabs-hide {
-		display: none;
-	}
-}
-/* @end */
-
-/* @form.basic */
-form.basic {	
-	input[type=text], input[type=search], input[type=email], input[type=password], textarea {
-		width: 500px;
-		padding: 5px;
-		font-size: 1em;
-		color: #555;
-	}
-
-	textarea {
-		resize: vertical;
-		height: 150px;
-	}
-
-	.error, .errorExplanation {
-		margin-left: 4px;
-		color: red;
-	}
-
-	.field {
-		padding: 10px 0;
-	}
-
-	.description {
-		color: #949494;
-	}
-
-	p {
-		margin: 1.5em 0;
-		overflow: hidden;
-	}
-
-	.required_mark {
-		margin-left: 0em;
-		color: red;
-	}
-
-	.radios {
-		.radio {
-			padding: 5px;
-			margin: 0;
-
-			&:nth-child(odd) {
-				border-bottom: 0;
-			}
-
-			&.checked {
-				background: #eee;
-				&:hover {
-					background: #eee;
-				}
-			}
-
-			&:hover {
-				background: #eee;
-				cursor: pointer;
-			}
-
-			input[type=radio] {
-				margin: 0 1em 0 0;
-			}
-		}
-	}
-	
-	ul.checkboxes {
-		li.checkbox {
-			margin: 0 0 10px;
-			
-			label {
-				margin: 0 0 0 5px;
-			}
-		}
-	}
-}
-/* @end */
-
-
-img.avatar {
-	width: 50px;
-	height: 50px;
-}
-
-.clearfix {
-	clear: both;
-}
-
-.label {
-	padding: 1px 6px 2px;
-	font-size: 9.75px;
-	font-weight: bold;
-	color: white;
-	text-transform: uppercase;
-	white-space: nowrap;
-	background-color: #BFBFBF;
-	@include rounded(3px);
-	line-height: 18px;
-}
-
-/* scope button */
-ul.scopes {
-	overflow: hidden;
-	list-style: none;
-	padding: 5px;
-	margin: 0;
-
-	li {
-		float: left;
-		margin-right: 5px;
-		padding-right: 5px;
-
-		span {
-			font-weight: bold;
-		}
-
-		a {
-			padding: 2px 4px;
-
-			&.current {
-				background: $color_yellow;
-				color: #fff;
-			}
-		}
-	}
-}
-
-.logs {
-	.header {
-		background: #eee;
-		padding: 5px;
-		margin: 0 0 1em;
-
-		.version {
-			color: $color_green;
-			margin: 0 1em 0 0;
-			font-weight: bold;
-		}
-	}
-
-	.log {
-		overflow: hidden;
-		margin: 0 0 1em;
-
-		.left {
-			float: left;
-			width: 100px;
-			margin: 0 10px 0 0;
-			text-align: right;
-
-			.new {
-				background: $color_red;
-			}
-
-			.fixed {
-				background: $color_green;
-			}
-
-			.improved {
-				background: $color_yellow;
-			}
-		}
-
-		.right {
-			float: left;
-			width: 80%;
-
-			p {
-				margin: 0 0 5px;
-			}
-
-			.title {
-				font-weight: bold;
-			}
-		}
-	}
-}
-
-.row {
-	padding: 10px 0;
-	margin: 10px 0;
-	border-top: 1px solid #eee;
-	overflow: hidden;
-
-	.key {
-		float: left;
-		width: 200px;
-		text-transform: uppercase;
-		font-weight: bold;
-	}
-
-	.value {
-		float: left;
-		width: 320px;
-		color: #444;
-
-		.sub {
-			padding: 10px 0;
-			border-top: 1px solid #DDD;
-			width: 100%;
-			overflow: hidden;
-
-			&:first-child {
-				padding-top: 0;
-				border-top: 0;
-			}
-
-			&:last-child {
-				padding-bottom: 0;
-			}
-		}
-	}
-}
-
-.toolbar {
-	overflow: hidden;
-	margin: 0 0 30px 0;
-	
-	.left {
-		float: left;
-		margin-right: 10px;
-	}
-	
-	.right {
-		float: right;
-		margin-left: 10px;
-	}
-}
-
-.list {
-	margin: 1em 0;
-	padding: 0 0 0 4em;
-	
-	li {
-		margin: 0 0 0.5em 0;
-	}
-}
-
-ul.list {
-	list-style-type: disc;
-}
-
-ol.list {
-	list-style-type: decimal;
-}
-
 .field_with_errors {
   padding: 2px;
   background-color: red;
-  display: table;
 }
 
 #error_explanation {
-  width: 450px;
   border: 2px solid red;
   padding: 7px;
   padding-bottom: 0;
@@ -493,9 +81,8 @@ ol.list {
     background-color: #c00;
     color: #fff;
 	}
- 
+
 	ul {
 	  list-style: square;
-		@extend .list;
-	} 
+	}
 }

data/app/assets/stylesheets/jap_mag.css

@@ -9,8 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require jap_mag/reset
- *= require jap_mag/variables
  *= require jap_mag/widgets
- *= require jap_mag/base
+ *= require jap_mag/buttons
  */