Skip to content

R
rendezvous
Commit 602bf5e0 by tady
Options

css flow

parent 4ebef2e0
Showing with 80 additions and 401 deletions
app/assets/stylesheets/application.css
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
*= require_tree ./lib *= require_tree ./lib
*= require_tree ./modules *= require_tree ./modules
*= require_tree . *= require_tree .
*= require bootstrap-rendezvous
*= require_self *= require_self
*/ */
app/assets/stylesheets/bootstrap-rendezvous.css.scss deleted 100644 → 0
$set_prefix: -webkit-, -moz-, -ms-, -o-, '';
$theme-color-main: #75b3c8;
@mixin background_color($bg_value: $theme-color-main) {
background-color: $bg_value;
color: #fff;
}
@mixin border_radius($br_value: 4px) {
@each $prefix in $set_prefix {
#{$prefix}border-radius: $br_value
}
}
@mixin transition($transition_value: 0.3s, $move_type: ease-in-out) {
@each $prefix in $set_prefix {
#{$prefix}transition: all $transition_value $move_type
}
}
@import url(https://fonts.googleapis.com/css?family=Flamenco:300,400);
@import url(https://fonts.googleapis.com/css?family=Quicksand:300,400,700);
.btn-original {
background: transparent!important;
border: 1px solid #fff;
font-family: 'Quicksand', sans-serif;
font-weight: 300;
font-size: 24px;
letter-spacing: 0em;
&:hover {
border: 1px solid #75b3c8;
background-color: #75b3c8!important;
@include transition;
}
}
app/assets/stylesheets/modules/_settings.css.scss
...@@ -4,10 +4,12 @@ $set_prefix: -webkit-, -moz-, -ms-, -o-, ''; ...@@ -4,10 +4,12 @@ $set_prefix: -webkit-, -moz-, -ms-, -o-, '';
$theme-color-dark: #3C5866; $theme-color-dark: #3C5866;
$theme-color-light: #F6FCFF; $theme-color-light: #F6FCFF;
$theme-color-middle-light: #E4F3FF;
$theme-color-main: #86C6E5; $theme-color-main: #86C6E5;
// $theme-color4: #f0f0f0; // $theme-color4: #f0f0f0;
// $theme-color5: #669CAE; // $theme-color5: #669CAE;
$theme-text-color: #ffffff; $theme-text-color: #ffffff;
$theme-key-color: #ec0160;
$theme-font-base: Verdana, "Hiragino Kaku Gothic ProN", Meiryo, sans-serif; $theme-font-base: Verdana, "Hiragino Kaku Gothic ProN", Meiryo, sans-serif;
......
app/assets/stylesheets/modules/common.css.scss
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
body { body {
background-color: $bg-base-color; background-color: $bg-base-color;
font-family: $theme-font-base; font-family: $theme-font-base;
color: $theme-color-light; color: $theme-color-dark;
} }
app/assets/stylesheets/modules/flow.css.scss
// @import 'modules/settings'; @import 'modules/settings';
// .panel { // .panel {
// border: 1px solid $theme-color-main; // border: 1px solid $theme-color-main;
// .panel-heading { // .panel-heading {
...@@ -53,16 +54,19 @@ ...@@ -53,16 +54,19 @@
// } // }
.numbers-wrapper { .numbers-wrapper {
height: 100px; height: 120px;
text-align: center; text-align: center;
font-family: 'Quicksand'; font-family: $text-deco-font;
color: $theme-color-dark;
.large { .large {
font-size: 3em; font-size: 3em;
font-weight: 300; font-weight: 300;
color: #ec0160; color: $theme-key-color;
} }
label { label {
border-top: 5px solid #ec0160; border-top: 5px solid $theme-key-color;
font-weight: 500; font-weight: 500;
} }
} }
......
app/assets/stylesheets/modules/navbar.css.scss
@import 'modules/settings'; @import 'modules/settings';
.navbar { .navbar.navbar-default {
background-color: $theme-color-main; background-color: $theme-color-main;
background-image: none;
font-size: 1.2em; font-size: 1.2em;
font-weight: 500; font-weight: 500;
.navbar-brand {
background: none;
}
a { a {
color: $theme-color-light;
font-family: $text-deco-font; font-family: $text-deco-font;
} color: $theme-color-light;
a.btn-default { &:visited {
background: $theme-color-light; color: $theme-color-light;
color: $theme-color-main; }
border: none;
} }
.badge { .badge {
...@@ -22,12 +25,39 @@ ...@@ -22,12 +25,39 @@
border: 1px solid $theme-color-light; border: 1px solid $theme-color-light;
} }
.navbar-toggle {
border-color: $theme-color-dark;
}
.navbar-toggle:hover, .navbar-toggle:focus {
background-color: $theme-color-middle-light;
}
.navbar-toggle .icon-bar {
background-color: $theme-color-dark;
}
.navbar-nav li {
a {
color: $theme-color-light;
&.btn-default {
background: $theme-color-light;
color: $theme-color-main;
border: none;
}
}
.dropdown-menu { .dropdown-menu {
a {
color: $theme-color-dark;
}
.badge { .badge {
color: $theme-color-dark; color: $theme-color-dark;
border-color: $theme-color-dark; border-color: $theme-color-dark;
} }
} }
}
} }
.nav { .nav {
......
app/assets/stylesheets/modules/panel.css.scss
@import 'modules/settings'; @import 'modules/settings';
.panel-heading { .panel-heading {
background-color: $theme-color-main; background-color: $theme-color-middle-light;
color: $theme-color-light; color: $theme-color-dark;
} }
app/assets/stylesheets/modules/text.css.scss 0 → 100644
@import 'modules/settings';
// .text-shadow {
// color: #999999;
// }
a {
// color: $theme-color-main;
&:visited {
color: $theme-color-dark;
}
}
app/assets/stylesheets/modules/tmp.css.scss
@import 'modules/settings'; @import 'modules/settings';
@import url(https://fonts.googleapis.com/css?family=Flamenco:300,400);
@import url(https://fonts.googleapis.com/css?family=Quicksand:300,400,700);
p, h1, h2, h3, h4, h5, h6, span {
// font-family: 'メイリオ', 'meiryo', hiragino kaku go;
// letter-spacing: 2pt;
// line-height: 150%;
// margin: 0;
// padding: 0;
}
.badge.badge-transparent { .badge.badge-transparent {
background-color: transparent; background-color: transparent;
color: $theme-color-main; color: $theme-color-main;
...@@ -19,17 +9,6 @@ p, h1, h2, h3, h4, h5, h6, span { ...@@ -19,17 +9,6 @@ p, h1, h2, h3, h4, h5, h6, span {
padding: 4px 6px; padding: 4px 6px;
} }
.text-shadow {
color: #999999;
}
a .text-link {
color: #1e0fbe;
}
a:visited .text-link {
color: #609;
}
.popover { .popover {
max-width: 400px; max-width: 400px;
......
app/assets/stylesheets/posts.css.scss deleted 100644 → 0
@import 'modules/settings';
#post-form {
.row {
margin-top: 20px;
.col-xs-9 {
.field {
margin-bottom: 10px;
.input-group-addon {
background-color: #fff;
border-top: 1px solid $theme-color-main;
border-left: 1px solid $theme-color-main;
border-bottom: 1px solid $theme-color-main;
color: $theme-color-main;
label {
margin-bottom: 0;
font-weight: 300;
}
}
.form-control {
border: 1px solid $theme-color-main;
padding: 10px!important;
height: 50px;
}
.select2-choices {
box-shadow: 0 0 0 #fff;
border: 1px solid $theme-color-main;
background-image: none;
padding: 5px;
}
}
}
}
.btn-toolbar {
> .btn-group > .btn {
color: $theme-color-main;
background-color: #fff;
box-shadow: 0 0 0 #fff;
}
}
textarea {
padding: 10px;
border-top: 0px solid #fff;
&:focus {
box-shadow: 0 0 0 #fff!important;
background-color: #fff;
}
}
.mod-mdEditor-textarea {
&:focus {
box-shadow: 0 0 0 #fff!important;
}
}
.preview-wrapper {
.mod-mdEditor-preview {
}
.panel-body {
padding: 10px;
padding-top: 0;
}
}
#save_button {
margin-bottom: 10px;
}
table {
width: 100%;
}
td {
width: 50%;
}
}
input,
textarea {
border: 1px solid $theme-color-main;
&:focus {
border: 1px solid $theme-color-main;
background-color: #f8f8f8;
box-shadow: 0 0 0 #fff!important;
@include transition;
}
}
app/assets/stylesheets/template.css.scss deleted 100644 → 0
// Place all the styles related to the templates controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
// /*************************************************************************
// * app_header
// *************************************************************************/
// @import 'modules/settings';
// @import url(https://fonts.googleapis.com/css?family=Flamenco:300,400);
// @import url(https://fonts.googleapis.com/css?family=Quicksand:300,400,700);
// $theme-color-main: #75b3c8;
// .template-wrapper {
// margin-top: 15px;
// }
// .navbar-original {
// background-color: $theme-color-main!important;
// background-image: none!important;
// li:hover {
// cursor: pointer;
// // a {
// // color: $theme-color-main;
// // }
// }
// li.new-post-btn:hover {
// background-color: $theme-color-main;
// a {
// color: #fff;
// }
// }
// a {
// color: #fff;
// font-family: 'Quciksand', 'meiryo', 'メイリオ','sans-serif';
// letter-spacing: .1em;
// font-weight: 300;
// @include transition;
// }
// .input-group {
// input {
// border: 1px solid transparent;
// box-shadow: none;
// }
// button {
// background-color: #fff;
// border: 1px solid #fff;
// .search {
// width: 20px;
// &:hover {
// opacity: .7;
// @include transition;
// }
// }
// }
// }
// .nav-icon {
// width: 20px;
// margin-right: 5px;
// }
// li.stock img {
// width: 25px;
// position: relative;
// bottom: 2px;
// }
// li.flow {
// a {
// position: relative;
// top: 2px;
// }
// img {
// position: relative;
// bottom: 2px;
// }
// }
// .navbar-right {
// .new-post-btn {
// .btn {
// position: relative;
// background-color: #fafafa;
// color: $theme-color-main;
// vertical-align: middle;
// &:hover {
// background-color: #ddd;
// @include transition;
// }
// }
// .write {
// width: 17px;
// vertical-align: middle;
// position: relative;
// bottom: 1px;
// }
// }
// }
// .badge {
// background-color: transparent;
// color: #fff;
// letter-spacing: 0;
// border: 1px solid #fff;
// padding: 4px 4px;
// margin-left: 5px;
// min-width: 20px;
// min-height: 20px;
// }
// .dropdown-menu {
// background-color: $theme-color-main;
// a {
// color: #fff;
// }
// }
// }
app/assets/stylesheets/tmp.css.scss deleted 100644 → 0
@import 'modules/settings';
@import url(https://fonts.googleapis.com/css?family=Flamenco:300,400);
@import url(https://fonts.googleapis.com/css?family=Quicksand:300,400,700);
p, h1, h2, h3, h4, h5, h6, span {
// font-family: 'メイリオ', 'meiryo', hiragino kaku go;
// letter-spacing: 2pt;
// line-height: 150%;
// margin: 0;
// padding: 0;
}
.badge.badge-transparent {
background-color: transparent;
color: $theme-color-main;
// font-family: 'Quicksand';
letter-spacing: 0;
border: 1.5px solid $theme-color-main;
padding: 4px 6px;
}
.text-shadow {
color: #999999;
}
a .text-link {
color: #1e0fbe;
}
a:visited .text-link {
color: #609;
}
.popover {
max-width: 400px;
}
.navbar-default .navbar-brand {
background-color: #428bca;
color: #fff;
}
.navbar-default .navbar-brand,
.label a {
// color: white;
}
/* #app-search-form {
width: 200px;
}
*/
.container-main{
min-height: 400px;
}
.body-padding {
padding-top: 70px;
}
app/assets/stylesheets/welcome.css.scss deleted 100644 → 0
@import url(https://fonts.googleapis.com/css?family=Quicksand:300,400,700);
$theme-color-main: #75b3c8;
.background-image {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
background-image: image-url("compass.jpg");
background-size: cover;
}
.background-mask {
width: 100%;
height: 100%;
background-color: rgba(#000, .6);
position: fixed;
top: 0;
left: 0;
}
.login {
.container.marketing {
h2.title {
font-family: 'Quicksand', sans-serif;
font-weight: 300;
font-size: 62px;
color: #fff;
}
p {
color: #fff;
}
}
.welcome-box {
text-align: center;
.btn-original {
margin-top: 140px;
}
.zigexn {
margin-top: 20px;
}
}
.featurette {
.featurette-heading {
margin-top: 0;
color: #ddd;
line-height: 150%;
font-family: 'Quicksand','メイリオ', 'meiryo', hiragino kaku go;
}
.text-muted {
color: #ccc;
font-family: 'Quicksand','メイリオ', 'meiryo', hiragino kaku go;
}
.featurette-image {
box-shadow: 1px 1px 1px #ccc;
border-radius: 5px;
}
}
}
app/views/flow/show.html.slim
...@@ -27,20 +27,21 @@ ...@@ -27,20 +27,21 @@
.col-xs-12.col-md-8 role="navigation" .col-xs-12.col-md-8 role="navigation"
.panel .panel
.panel-heading .panel-heading
h1 h2.panel-title
= image_tag 'flow.png'
| Flow | Flow
small - 最近投稿された記事 small - 最近投稿された記事
.panel-body.list-group .panel-body
ul.list-group
- @posts.each do |_post| - @posts.each do |_post|
li.list-group-item
= render partial: 'posts/large_item', locals: { post: _post } = render partial: 'posts/large_item', locals: { post: _post }
= paginate(@posts) = paginate(@posts)
.col-xs-12.col-md-4 .col-xs-12.col-md-4
.panel .panel
.panel-heading .panel-heading
h2.panel-title この1週間で閲覧の多かった投稿 h3.panel-title この1週間で閲覧の多かった投稿
.panel-body.list-group .panel-body.list-group
- Post.most_pv_in_this_week(5).each do |(post, footprints_count)| - Post.most_pv_in_this_week(5).each do |(post, footprints_count)|
a.list-group-item.post-list href=post_path(post) a.list-group-item.post-list href=post_path(post)
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
.panel .panel
.panel-heading .panel-heading
h2.panel-title 最近あなたが投稿した記事 h3.panel-title 最近あなたが投稿した記事
.panel-body.list-group .panel-body.list-group
- current_user.posts.recent(10).each do |post| - current_user.posts.recent(10).each do |post|
= render partial: 'posts/small_item', locals: { post: post.decorate } = render partial: 'posts/small_item', locals: { post: post.decorate }
...@@ -57,7 +58,7 @@ ...@@ -57,7 +58,7 @@
.panel .panel
.panel-heading .panel-heading
h2.panel-title 最近投稿されたタグ h3.panel-title 最近投稿されたタグ
.panel-body.list-group .panel-body.list-group
- Tag.recent(10).each_with_index do |tag, i| - Tag.recent(10).each_with_index do |tag, i|
a.list-group-item data-tag-id=tag.id href=search_path(q: "##{tag.name}") a.list-group-item data-tag-id=tag.id href=search_path(q: "##{tag.name}")
......
app/views/partials/_app_header.html.slim
nav.navbar.navbar-fixed-top role="navigation" nav.navbar.navbar-default.navbar-fixed-top role="navigation"
.container-fluid .container-fluid
.navbar-header .navbar-header
...@@ -15,13 +15,13 @@ nav.navbar.navbar-fixed-top role="navigation" ...@@ -15,13 +15,13 @@ nav.navbar.navbar-fixed-top role="navigation"
input.form-control name="q" placeholder="Search" type="text" value=params[:q] / input.form-control name="q" placeholder="Search" type="text" value=params[:q] /
ul.nav.navbar-nav ul.nav.navbar-nav
li class=('active' if current_page?(flow_path)) li
a.nav-icon.flow href=flow_path title="Flow" a.nav-icon.flow href=flow_path title="Flow"
| Flow | Flow
li class=('active' if current_page?(stock_path)) li
a.nav-icon.stock href=stock_path title="Stock" a.nav-icon.stock href=stock_path title="Stock"
| Stock | Stock
li class=('active' if current_page?(templates_path)) li
a.nav-icon.template href=templates_path title="Templates" a.nav-icon.template href=templates_path title="Templates"
| Templates | Templates
......
app/views/posts/_large_item.html.slim
/ locals: / locals:
/ post {Post} / post {Post}
a.list-group-item.post-list.mod-hover-hidden data-post-id=post.id href=post_path(post) / a.list-group-item.post-list.mod-hover-hidden data-post-id=post.id href=post_path(post)
.container-fluid .container-fluid
.row .row
.col-xs-9 .col-xs-9
h4.text-link #{post.title} h4
a href=post_path(post) = post.title
.col-xs-3 .col-xs-3
span.label.label-danger.label-date = post.display_specified_date if post.specified_date span.label.label-danger.label-date = post.display_specified_date if post.specified_date
small.pull-right ##{post.id} small.pull-right ##{post.id}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment