diff options
author | Rhenium <rhenium@rhe.jp> | 2013-11-17 16:05:30 +0900 |
---|---|---|
committer | Rhenium <rhenium@rhe.jp> | 2013-11-17 16:05:30 +0900 |
commit | 070fafaf8b937f71891526a4d877682b35242085 (patch) | |
tree | c97a6ce7676877002a7026042db37cac601dc901 | |
parent | deb1cf3a85b096fa7475144536c1c29ce81a9f49 (diff) | |
download | aclog-070fafaf8b937f71891526a4d877682b35242085.tar.gz |
fix layout
-rw-r--r-- | app/assets/javascripts/_html-autoload.js (renamed from app/assets/javascripts/html-autoload.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/_widgets.js (renamed from app/assets/javascripts/widgets.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/about.js | 0 | ||||
-rw-r--r-- | app/assets/javascripts/application.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/errors.js | 0 | ||||
-rw-r--r-- | app/assets/javascripts/help.js | 0 | ||||
-rw-r--r-- | app/assets/javascripts/settings.js | 0 | ||||
-rw-r--r-- | app/assets/javascripts/tweets.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/users.js | 0 | ||||
-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 | 9 | ||||
-rw-r--r-- | app/views/layouts/_base.html.haml | 8 | ||||
-rw-r--r-- | app/views/tweets/_tweet.html.haml | 2 |
15 files changed, 14 insertions, 9 deletions
diff --git a/app/assets/javascripts/html-autoload.js b/app/assets/javascripts/_html-autoload.js index d96b80b..d96b80b 100644 --- a/app/assets/javascripts/html-autoload.js +++ b/app/assets/javascripts/_html-autoload.js diff --git a/app/assets/javascripts/widgets.js b/app/assets/javascripts/_widgets.js index 74ce17a..74ce17a 100644 --- a/app/assets/javascripts/widgets.js +++ b/app/assets/javascripts/_widgets.js diff --git a/app/assets/javascripts/about.js b/app/assets/javascripts/about.js new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/app/assets/javascripts/about.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3496379..5c90241 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,4 +1,4 @@ //= require jquery //= require jquery_ujs -//= require widgets +//= require _widgets diff --git a/app/assets/javascripts/errors.js b/app/assets/javascripts/errors.js new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/app/assets/javascripts/errors.js diff --git a/app/assets/javascripts/help.js b/app/assets/javascripts/help.js new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/app/assets/javascripts/help.js diff --git a/app/assets/javascripts/settings.js b/app/assets/javascripts/settings.js new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/app/assets/javascripts/settings.js diff --git a/app/assets/javascripts/tweets.js b/app/assets/javascripts/tweets.js index ca93f49..5a0b955 100644 --- a/app/assets/javascripts/tweets.js +++ b/app/assets/javascripts/tweets.js @@ -1,4 +1,4 @@ -//= require html-autoload +//= require _html-autoload $(function() { $(".pagination").hide(); $.autopager({ diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/app/assets/javascripts/users.js diff --git a/app/assets/stylesheets/errors.css.sass b/app/assets/stylesheets/errors.css.sass new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/app/assets/stylesheets/errors.css.sass diff --git a/app/assets/stylesheets/help.css.sass b/app/assets/stylesheets/help.css.sass new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/app/assets/stylesheets/help.css.sass diff --git a/app/assets/stylesheets/settings.css.sass b/app/assets/stylesheets/settings.css.sass new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/app/assets/stylesheets/settings.css.sass diff --git a/app/assets/stylesheets/tweets.css.sass b/app/assets/stylesheets/tweets.css.sass index 1adb1f7..790cf22 100644 --- a/app/assets/stylesheets/tweets.css.sass +++ b/app/assets/stylesheets/tweets.css.sass @@ -1,3 +1,5 @@ +@import "twitter/bootstrap/mixins" + .tweets :width 572px .tweet @@ -73,9 +75,11 @@ .stats :background #ffffff :padding 15px - .dl-horizontal + dl + @include clearfix() :margin 0 0 3px 0 dt + :float left :text-align left :width 60px .count, .type @@ -92,10 +96,11 @@ :font-weight normal :font-size 9px dd + :float left :margin 0 ul + @include clearfix() :margin 0 - :float left :width 480px li :float left diff --git a/app/views/layouts/_base.html.haml b/app/views/layouts/_base.html.haml index 7b90d14..a64cd34 100644 --- a/app/views/layouts/_base.html.haml +++ b/app/views/layouts/_base.html.haml @@ -6,14 +6,14 @@ = stylesheet_link_tag params[:controller], media: "all" = javascript_include_tag "application" = javascript_include_tag params[:controller] - %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"} + %meta{name: "viewport", content: "width=600px"} %body - .navbar.navbar-static-top + .navbar.navbar-default.navbar-static-top .container .navbar-header = link_to "aclog", root_path, class: "navbar-brand" - .navbar-collapse.collapse - %ul.nav.navbar-nav.navbar-right + .navbar-right + %ul.nav.navbar-nav %li = link_to "about", about_path - if logged_in? diff --git a/app/views/tweets/_tweet.html.haml b/app/views/tweets/_tweet.html.haml index 167d4a7..358e99a 100644 --- a/app/views/tweets/_tweet.html.haml +++ b/app/views/tweets/_tweet.html.haml @@ -35,7 +35,7 @@ .stats - [["favs", tweet.favorites_count, tweet.favoriters], ["retweets", tweet.retweets_count, tweet.retweeters]].each do |title, count, users| - if count > 0 - %dl.dl-horizontal + %dl %dt %span.count= count %span.type= title |