diff options
| author | Teddy Wing | 2015-01-24 11:08:53 -0500 | 
|---|---|---|
| committer | Teddy Wing | 2015-01-24 11:08:53 -0500 | 
| commit | 005e7cca168c6b4eeb06e314046f58b516c13aec (patch) | |
| tree | b524ad225825fab4a83d6aeae3cdc90c270a643b /app/assets | |
| parent | cc4e04cc9cc9a9db1353f5f8b77fdae0e664c287 (diff) | |
| download | Notes-angular-demo-005e7cca168c6b4eeb06e314046f58b516c13aec.tar.bz2 | |
Import markup & styles from 08b6f4f and prior
Grab new markup and styles from the `angular-app` branch. These include
some new things needed that came about once I built out the Angular app.
Set the textarea to a fixed height because I can't get 100% height to
work right now and don't have the time to figure it out.
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/components/type.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/layouts/_global.scss | 50 | 
2 files changed, 51 insertions, 3 deletions
diff --git a/app/assets/stylesheets/components/type.scss b/app/assets/stylesheets/components/type.scss index 7e8fc05..d4e4ecf 100644 --- a/app/assets/stylesheets/components/type.scss +++ b/app/assets/stylesheets/components/type.scss @@ -3,6 +3,10 @@  } +.font-size-16 { +	font-size: 16px; +} +  .font-size-28 {  	font-size: 28px;  } diff --git a/app/assets/stylesheets/layouts/_global.scss b/app/assets/stylesheets/layouts/_global.scss index 5113083..7e92b12 100644 --- a/app/assets/stylesheets/layouts/_global.scss +++ b/app/assets/stylesheets/layouts/_global.scss @@ -4,6 +4,10 @@ body {  } +.display-inline-block { +	display: inline-block; +} +  .display-block {  	display: block;  } @@ -13,10 +17,18 @@ body {  } +.margin-top--15 { +	margin-top: -15px; +} +  .margin-top-70 {  	margin-top: 70px;  } +.margin-left-8 { +	margin-left: 8px; +} +  .padding-13 {  	padding: 13px; @@ -37,6 +49,19 @@ body {  } +.border-none { +	border: none; +} + +.outline-none { +	outline: none; +} + + +.width-100\% { +	width: 100%; +} +  .min-height-100\% {  	min-height: 100%;  } @@ -48,10 +73,10 @@ body {  	height: 30px;  	padding: 20px; -	.right-button { +	.right-section {  		position: absolute;  		right: 40px; -		top: -33px; +		top: -22px;  	}  } @@ -117,8 +142,12 @@ $sidebar-width: 250px;  .note-editor {  	margin-left: $sidebar-width;  	padding: 12px 15px; -	font: 18px/1.7 Georgia, Times, serif;  	outline: none; +	 +	textarea { +		font: 18px/1.7 Georgia, Times, serif; +		height: 480px; +	}  } @@ -130,6 +159,12 @@ $sidebar-width: 250px;  	border-radius: 6px;  } +button.button { +	border: none; +	font: 16px Avenir, Helvetica, sans-serif; +	cursor: pointer; +} +  .button:hover {  	background-color: #178E17;  	color: #eee; @@ -140,3 +175,12 @@ $sidebar-width: 250px;  	-webkit-box-shadow:inset 0 2px 4px 0 #0D4F0D;  	box-shadow:inset 0 2px 4px 0 #0D4F0D;  } + + +input.form-field { +	border: 2px solid rgb(213, 202, 202); +	width: 260px; +	height: 42px; +	padding: 0 10px; +	font-size: 16px; +}  | 
