From bfc4ecda6370c4266d3b9760b5d1e30fb6338cf9 Mon Sep 17 00:00:00 2001 From: RealAnalysis Date: Sun, 26 Feb 2017 20:34:26 +0800 Subject: [PATCH 01/13] refix the pros again --- app/assets/stylesheets/application.scss | 5 + app/views/common/_navbar.html.erb | 2 +- app/views/layouts/application.html.erb | 106 +------------------- app/views/layouts/welcome.html.erb | 123 ++++++++++++++++++++++++ 4 files changed, 134 insertions(+), 102 deletions(-) create mode 100644 app/views/layouts/welcome.html.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 08eb98d989..4fec8a9763 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,6 +16,11 @@ // 导航一栏 +// navbar颜色问题修复 +#NavCol { +background-color: #2d2d30; +} + /* Add a dark background color with a little bit see-through */ .navbar { margin-bottom: 0; diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index f394126cd4..d00c02725e 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -1,4 +1,4 @@ -