Mercurial > zeropaste
changeset 354:5ac923264129
css -> scss.
| author | edogawaconan <me@myconan.net> |
|---|---|
| date | Thu, 03 Jul 2014 15:22:24 +0900 |
| parents | c33fd676e35f |
| children | 56382cb104dd |
| files | app/assets/stylesheets/alert.css app/assets/stylesheets/alert.css.scss app/assets/stylesheets/app_bootstrap.css.scss app/assets/stylesheets/app_bootstrap.scss app/assets/stylesheets/application.css app/assets/stylesheets/application.css.scss app/assets/stylesheets/pastes.css app/assets/stylesheets/pastes.css.scss app/assets/stylesheets/sticky-footer.css app/assets/stylesheets/sticky_footer.css.scss app/assets/stylesheets/tabs.css.scss app/assets/stylesheets/tabs.scss |
| diffstat | 12 files changed, 106 insertions(+), 114 deletions(-) [+] |
line wrap: on
line diff
--- a/app/assets/stylesheets/alert.css Thu Jul 03 15:17:09 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -.alert { - margin-top: 20px; -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/assets/stylesheets/alert.css.scss Thu Jul 03 15:22:24 2014 +0900 @@ -0,0 +1,3 @@ +.alert { + margin-top: 20px; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/assets/stylesheets/app_bootstrap.css.scss Thu Jul 03 15:22:24 2014 +0900 @@ -0,0 +1,7 @@ +@import 'bootstrap'; +@import 'sticky_footer'; + +// Rails support. +.field_with_errors { + @extend .has-error; +}
--- a/app/assets/stylesheets/app_bootstrap.scss Thu Jul 03 15:17:09 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -@import 'bootstrap'; -@import 'sticky-footer'; - -// Rails support. -.field_with_errors { - @extend .has-error; -}
--- a/app/assets/stylesheets/application.css Thu Jul 03 15:17:09 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * - *= require_self - *= require app_bootstrap - *= require bootstrap-prettify - *= require_tree . - */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/assets/stylesheets/application.css.scss Thu Jul 03 15:22:24 2014 +0900 @@ -0,0 +1,7 @@ +@import "app_bootstrap"; +@import "bootstrap-prettify"; + +@import "alert"; +@import "pastes"; +@import "sticky_footer"; +@import "tabs";
--- a/app/assets/stylesheets/pastes.css Thu Jul 03 15:17:09 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -textarea#paste_paste, .mirrored_text { - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - resize: none; - -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ - -moz-box-sizing: border-box; /* Firefox, other Gecko */ - box-sizing: border-box; /* Opera/IE 8+ */ -} - -#pl > pre { - word-break: normal; -} - -#paste-show > div, -#paste-show > ul, -.edit_paste { - margin-bottom: 20px; -} - -#paste_key { - border-radius: 4px 0 0 4px; -} - -.input-url1 { - display: none; -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/assets/stylesheets/pastes.css.scss Thu Jul 03 15:22:24 2014 +0900 @@ -0,0 +1,25 @@ +textarea#paste_paste, .mirrored_text { + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + resize: none; + -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ + -moz-box-sizing: border-box; /* Firefox, other Gecko */ + box-sizing: border-box; /* Opera/IE 8+ */ +} + +#pl > pre { + word-break: normal; +} + +#paste-show > div, +#paste-show > ul, +.edit_paste { + margin-bottom: 20px; +} + +#paste_key { + border-radius: 4px 0 0 4px; +} + +.input-url1 { + display: none; +}
--- a/app/assets/stylesheets/sticky-footer.css Thu Jul 03 15:17:09 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -/* Sticky footer styles --------------------------------------------------- */ - -html, -body { - height: 100%; - /* The html and body elements cannot have any padding or margin. */ -} - -/* Wrapper for page content to push down footer */ -#wrap { - min-height: 100%; - height: auto !important; - height: 100%; - /* Negative indent footer by its height */ - margin: 0 auto -60px; - /* Pad bottom by footer height + 10 */ - padding: 0 0 70px; -} - -/* Set the fixed height of the footer here */ -#footer { - height: 60px; - background-color: #f5f5f5; -} - - -/* Custom page CSS --------------------------------------------------- */ -/* Not required for template or sticky footer method. */ - -.container .credit { - margin: 20px 0; -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/assets/stylesheets/sticky_footer.css.scss Thu Jul 03 15:22:24 2014 +0900 @@ -0,0 +1,34 @@ +/* Sticky footer styles +-------------------------------------------------- */ + +html, +body { + height: 100%; + /* The html and body elements cannot have any padding or margin. */ +} + +/* Wrapper for page content to push down footer */ +#wrap { + min-height: 100%; + height: auto !important; + height: 100%; + /* Negative indent footer by its height */ + margin: 0 auto -60px; + /* Pad bottom by footer height + 10 */ + padding: 0 0 70px; +} + +/* Set the fixed height of the footer here */ +#footer { + height: 60px; + background-color: #f5f5f5; +} + + +/* Custom page CSS +-------------------------------------------------- */ +/* Not required for template or sticky footer method. */ + +.container .credit { + margin: 20px 0; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/assets/stylesheets/tabs.css.scss Thu Jul 03 15:22:24 2014 +0900 @@ -0,0 +1,30 @@ +#md { + // copypasta from bootstrap's variables.scss + $baseFontSize_orig: 14px; + $baseLineHeight_orig: 20px; + + // reduce for paste show + $baseFontSize: $baseFontSize_orig * 0.8; + $baseLineHeight: $baseLineHeight_orig * 0.8; + + .well { + background-color: darken(white, 2%); + } + + p { + margin: 0; + } + + // copypasta from bootstrap's type.scss + h1, + h2, + h3 { line-height: $baseLineHeight * 2; } + + // more copypasta from bootstrap's type.scss + h1 { font-size: $baseFontSize * 2.75; } + h2 { font-size: $baseFontSize * 2.25; } + h3 { font-size: $baseFontSize * 1.75; } + h4 { font-size: $baseFontSize * 1.25; } + h5 { font-size: $baseFontSize; } + h6 { font-size: $baseFontSize * 0.85; } +}
--- a/app/assets/stylesheets/tabs.scss Thu Jul 03 15:17:09 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -#md { - // copypasta from bootstrap's variables.scss - $baseFontSize_orig: 14px; - $baseLineHeight_orig: 20px; - - // reduce for paste show - $baseFontSize: $baseFontSize_orig * 0.8; - $baseLineHeight: $baseLineHeight_orig * 0.8; - - .well { - background-color: darken(white, 2%); - } - - p { - margin: 0; - } - - // copypasta from bootstrap's type.scss - h1, - h2, - h3 { line-height: $baseLineHeight * 2; } - - // more copypasta from bootstrap's type.scss - h1 { font-size: $baseFontSize * 2.75; } - h2 { font-size: $baseFontSize * 2.25; } - h3 { font-size: $baseFontSize * 1.75; } - h4 { font-size: $baseFontSize * 1.25; } - h5 { font-size: $baseFontSize; } - h6 { font-size: $baseFontSize * 0.85; } -}