diff options
| author | Rhenium <rhenium@rhe.jp> | 2014-01-31 05:42:18 +0900 |
|---|---|---|
| committer | Rhenium <rhenium@rhe.jp> | 2014-01-31 05:42:18 +0900 |
| commit | c36649973753bb7e0f13168e9d89f8f36bf1efe2 (patch) | |
| tree | 277cbd7509d18672f13d30527c05089e320d62cb /app/assets/stylesheets | |
| parent | 8b027827ebc487133e46a6dd4e304ce41111c163 (diff) | |
| download | aclog-c36649973753bb7e0f13168e9d89f8f36bf1efe2.tar.gz | |
reorganize asset files
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/_sidebar.css.sass | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/about.css.sass | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css.sass | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/errors.css.sass | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/help.css.sass | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/settings.css.sass | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/tweets.css.sass | 2 |
7 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/stylesheets/_sidebar.css.sass b/app/assets/stylesheets/_sidebar.css.sass index 5734004..a5464f2 100644 --- a/app/assets/stylesheets/_sidebar.css.sass +++ b/app/assets/stylesheets/_sidebar.css.sass @@ -1,3 +1,5 @@ +@import "bootstrap/mixins" + .sidebar :margin-top 20px .screen_name diff --git a/app/assets/stylesheets/about.css.sass b/app/assets/stylesheets/about.css.sass index 6fde7a8..2305695 100644 --- a/app/assets/stylesheets/about.css.sass +++ b/app/assets/stylesheets/about.css.sass @@ -1,4 +1,5 @@ @import url(http://fonts.googleapis.com/css?family=Lato:300) + .index :font-family "Lato", "Ubuntu", "Helvetica Neue", Arial, sans-serif h1 diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index bb75cc7..e14ef2b 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -1,5 +1,8 @@ -@import "twitter/bootstrap" -@import "sidebar" +/* + *= require_self + *= require_tree . + */ +@import "bootstrap" body :font-family "Ubuntu", "Helvetica Neue", Arial, sans-serif diff --git a/app/assets/stylesheets/errors.css.sass b/app/assets/stylesheets/errors.css.sass deleted file mode 100644 index e69de29..0000000 --- a/app/assets/stylesheets/errors.css.sass +++ /dev/null diff --git a/app/assets/stylesheets/help.css.sass b/app/assets/stylesheets/help.css.sass deleted file mode 100644 index e69de29..0000000 --- a/app/assets/stylesheets/help.css.sass +++ /dev/null diff --git a/app/assets/stylesheets/settings.css.sass b/app/assets/stylesheets/settings.css.sass deleted file mode 100644 index e69de29..0000000 --- a/app/assets/stylesheets/settings.css.sass +++ /dev/null diff --git a/app/assets/stylesheets/tweets.css.sass b/app/assets/stylesheets/tweets.css.sass index 574e358..b756735 100644 --- a/app/assets/stylesheets/tweets.css.sass +++ b/app/assets/stylesheets/tweets.css.sass @@ -1,4 +1,4 @@ -@import "twitter/bootstrap/mixins" +@import "bootstrap/mixins" .tweets :width 572px |