aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets
diff options
context:
space:
mode:
authorre4k <re4k@re4k.info>2013-03-27 19:16:50 +0900
committerre4k <re4k@re4k.info>2013-03-27 19:16:50 +0900
commit613da69215bd72a1f04a6e2b5568151a87b9e37a (patch)
tree13c845626244c5ef13fb957dde732b2a05f9a427 /app/assets
parent828b71c4b68186b1e6e729a244544a19d54d5929 (diff)
downloadaclog-613da69215bd72a1f04a6e2b5568151a87b9e37a.tar.gz
Add given_favorites_to
Refactor
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/_tweets.css.sass24
-rw-r--r--app/assets/stylesheets/application.css.sass16
-rw-r--r--app/assets/stylesheets/errors.css.scss3
3 files changed, 11 insertions, 32 deletions
diff --git a/app/assets/stylesheets/_tweets.css.sass b/app/assets/stylesheets/_tweets.css.sass
index d5617f6..4d3b32d 100644
--- a/app/assets/stylesheets/_tweets.css.sass
+++ b/app/assets/stylesheets/_tweets.css.sass
@@ -1,6 +1,5 @@
.items
:width 572px
- :margin 15px 0 15px 18px
.item
:margin 15px 0
.tweet
@@ -8,7 +7,6 @@
:background #ffffff
:border 1px solid #c1c5cb
:border-width 1px 0
- //:border-radius 4px 4px 0 0
:padding 15px
.avatar
:width 60px
@@ -25,20 +23,19 @@
:width 473px
.user
:padding 0 5px 15px
- :font-weight bold
+ a
+ :color #666666
.name
:font-size 14px
.screen_name
:font-size 12px
- a
- :color #666666
.text
:font-size 18px
:line-height 25px
:padding 0 5px 15px
:word-wrap break-word
.meta
- :padding 0 5px 15px
+ :padding 0 5px
:color #666666
:font-size 12px
.twitter_bird
@@ -55,17 +52,13 @@
:display block
:float right
.stats
- //:border 1px solid #c1c5cb
- //:border-width 0 1px 1px
- //:border-radius 0 0 4px 4px
+ :background #ffffff
:padding 15px
- //:background #edf0f4
.dl-horizontal
:margin 0 0 3px 0
- dt.info
+ dt
:text-align left
:width 60px
- :float left
.count, .type
:color #666666
:display block
@@ -73,17 +66,14 @@
:font-weight bold
:font-size 14px
.type
+ :font-weight normal
:font-size 10px
- .height_fix
- :float left
- :height 48px
- :width 0
+ :text-transform uppercase
dd
:margin 0
ul
:margin 0
:float left
- :list-style none
:width 480px
li
:float left
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 5f250b3..c2bd877 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -1,18 +1,10 @@
@import "bootstrap"
@import "tweets"
+@import "users"
+@import "sidebar"
-.sidebar
- :margin-top 20px
- .screen_name
- :text-align center
- :font-size larger
- :margin 10px 0
- .avatar
- :text-align center
- .table
- .data
- :text-align right
a
:text-decoration none
:color #3b5998
-
+h1
+ :font-size 32px
diff --git a/app/assets/stylesheets/errors.css.scss b/app/assets/stylesheets/errors.css.scss
deleted file mode 100644
index 5b23d97..0000000
--- a/app/assets/stylesheets/errors.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the errors controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/