bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make design responsive

Browse Source
This commit is contained in:
Benjamin ter Kuile
2013-03-02 16:04:16 +01:00
parent 08333cb1bb
commit 63e201a69f
21 changed files with 350 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/layouts/theme1-home.html.slim
+26 -28
View File
@@ -10,7 +10,7 @@ html lang="en"
/! Le HTML5 shim, for IE6-8 support of HTML elements
/[if lt IE 9]
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
= stylesheet_link_tag "application", :media => "all"
= stylesheet_link_tag "theme1/application", :media => "all"
link href="/favicon.ico" rel="shortcut icon"
link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
@@ -27,38 +27,36 @@ html lang="en"
.container
#header
#header-right= render 'theme1/social'
#logo= link_to image_tag('icons/logo-medium.png', alt: application_title), root_path
#nav-wrap
.container= render 'theme1/navigation'
#banner-wrap
.left
.right
.container
#banner
.wsite-header
.clearing
#logo= link_to image_tag('icons/logo-text.png', alt: application_title), root_path
#nav-wrap.container
.navbar
.navbar-inner= render 'theme1/navigation'
#home-splash
#home-splash-content.container
#home-splash-content-inner
#home-splash-content-inner-bar
#home-splash-footer
.left
.right
#home-splash-footer-inner.container
#home-splash-footer-inner-bar
#main-wrap
.container
.content-top
.main-inner
#wsite-content.wsite-not-footer
= yield :page_title
= yield
- if flash[:alert].present?
.alert.alert-error
a.close data-dismiss="alert" ×
div= flash[:alert]
- if flash[:notice].present?
.alert.alert-success
a.close data-dismiss="alert" ×
div= flash[:notice]
= yield :page_title
= yield
#footer-wrap
.footer-shadow
.container
.footer-top
= render 'footer'
.bottom
| © Qwaiter 2012
.content
- if flash[:alert].present?
.alert.alert-error
a.close data-dismiss="alert" ×
div= flash[:alert]
- if flash[:notice].present?
.alert.alert-success
a.close data-dismiss="alert" ×
div= flash[:notice]
.footer-content= render 'footer'
.footer-bottom © Qwaiter 2013
= javascript_include_tag "application"
app/views/layouts/theme1.html.slim
+19 -23
View File
@@ -12,6 +12,7 @@ html lang="en"
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
= stylesheet_link_tag "theme1/application", :media => "all"
link href="/favicon.ico" rel="shortcut icon"
link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
body
.header-nav-banner
@@ -26,36 +27,31 @@ html lang="en"
.container
#header
#header-right= render 'theme1/social'
#logo= link_to image_tag('icons/logo-medium.png', alt: application_title), root_path
#nav-wrap
.container= render 'theme1/navigation'
#banner-wrap
#logo= link_to image_tag('icons/logo-text.png', alt: application_title), root_path
#nav-wrap.container
.navbar
.navbar-inner= render 'theme1/navigation'
#content-header
.left
.right
.container
#banner.standard
.wsite-header
.clearing
.top-ribbon
#main-wrap
.container
.content-top
.main-inner
#wsite-content.wsite-not-footer
- if flash[:alert].present?
.alert.alert-error
a.close data-dismiss="alert" ×
div= flash[:alert]
- if flash[:notice].present?
.alert.alert-success
a.close data-dismiss="alert" ×
div= flash[:notice]
= yield :page_title
= yield
- if flash[:alert].present?
.alert.alert-error
a.close data-dismiss="alert" ×
div= flash[:alert]
- if flash[:notice].present?
.alert.alert-success
a.close data-dismiss="alert" ×
div= flash[:notice]
= yield :page_title
= yield
#footer-wrap
.footer-shadow
.container
.footer-top
= render 'footer'
.bottom
| © Qwaiter 2012
.footer-content= render 'footer'
.footer-bottom © Qwaiter 2013
= javascript_include_tag "theme1/application"
app/views/supplier/edit.html.slim
+1 -1
View File
@@ -1,4 +1,4 @@
/- content_for :head do
- content_for :head do
= javascript_include_tag 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false'
= form_for @supplier, url: supplier_update_settings_path, html: {class: 'form-horizontal'} do |f|
app/views/theme1/_navigation.html.slim
+15 -7
View File
@@ -1,7 +1,15 @@
ul.nav
li[class=(current_page?(controller: '/dashboard', action: 'home') ? :active : nil)]= link_to t('menu.home'), root_path
li[class=(current_page?(controller: '/dashboard', action: 'about') ? :active : nil)]= link_to t('menu.about'), about_path
li[class=(current_page?(controller: '/dashboard', action: 'clients') ? :active : nil)]= link_to t('menu.clients'), clients_path
li[class=(current_page?(controller: '/dashboard', action: 'bars_restaurants') ? :active : nil)]= link_to t('menu.bars_restaurants'), bars_restaurants_path
li[class=(current_page?(controller: '/dashboard', action: 'cartoon') ? :active : nil)]= link_to t('menu.cartoon'), cartoon_path
li[class=(current_page?(controller: '/dashboard', action: 'contact') ? :active : nil)]= link_to t('menu.contact'), contact_path
.container
a.btn.btn-navbar data-toggle="collapse" data-target=".nav-collapse"
span.icon-bar
span.icon-bar
span.icon-bar
ul.nav
li[class=(current_page?(controller: '/dashboard', action: 'home') ? :active : nil)]= link_to t('menu.home'), root_path
li[class=(current_page?(controller: '/dashboard', action: 'about') ? :active : nil)]= link_to t('menu.about'), about_path
.nav-collapse.collapse
ul.nav
li[class=(current_page?(controller: '/dashboard', action: 'clients') ? :active : nil)]= link_to t('menu.clients'), clients_path
li[class=(current_page?(controller: '/dashboard', action: 'bars_restaurants') ? :active : nil)]= link_to t('menu.bars_restaurants'), bars_restaurants_path
li[class=(current_page?(controller: '/dashboard', action: 'cartoon') ? :active : nil)]= link_to t('menu.cartoon'), cartoon_path
li[class=(current_page?(controller: '/dashboard', action: 'contact') ? :active : nil)]= link_to t('menu.contact'), contact_path