Skip to content

Commit

Permalink
🔥 Strip bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
mijdavis2 committed Nov 11, 2016
1 parent 3c0e371 commit fbc1820
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 331 deletions.
6 changes: 0 additions & 6 deletions starter_weppy/static/bs3/css/bootstrap.min.css

This file was deleted.

Binary file not shown.
288 changes: 0 additions & 288 deletions starter_weppy/static/bs3/fonts/glyphicons-halflings-regular.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
7 changes: 0 additions & 7 deletions starter_weppy/static/bs3/js/bootstrap.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion starter_weppy/views/_global_footer.haml
@@ -1,6 +1,6 @@
%a{href: "#0", class: "cd-top"}
Top
%footer.footer.navbar.navbar-inverse.navbar-fixed-bottom
%footer
.container{style: "padding-top:15px"}
%p.text-muted © StarterWeppy 2016
1 change: 0 additions & 1 deletion starter_weppy/views/_global_head.haml
Expand Up @@ -3,5 +3,4 @@
%link{href: "../static/images/favicon.ico", rel: "shortcut icon"}
- include_helpers
- include_static 'bs3/css/bootstrap.min.css'
- include_static 'css/style.css'
43 changes: 15 additions & 28 deletions starter_weppy/views/_global_navbar.haml
@@ -1,28 +1,15 @@
%nav.navbar.navbar-inverse.navbar-static-top
.container
.navbar-header
%button.navbar-toggle{type: "button", data-toggle: "collapse", data-target: ".navbar-collapse"}
%span.sr-only Toggle Navigation
%span.icon-bar
%span.icon-bar
%span.icon-bar
%a.navbar-brand{href: "{{=url('main.welcome')}}"} StarterWeppy
.collapse.navbar-collapse
%ul.nav.navbar-nav
%li
%a{href: "{{=url('main.welcome')}}"}
= T("Home")
%li
%a{href: "{{=url('admin.users')}}"}
= T("Users")
- if not current_user
%li
%a{href: "{{=url('main.account', 'login')}}", id: "navbar-login"}
= T("Login")
- else
%li
%a{href: "{{=url('user.profile', current_user.id)}}"}
= T("Profile")
%li
%a{href: "{{=url('main.account', 'logout')}}"}
= T("Logout")
%a{href: "{{=url('main.welcome')}}"}
= T("Home")
%a{href: "{{=url('admin.users')}}"}
= T("Users")
- if not current_user
%a{href: "{{=url('main.account', 'login')}}", id: "navbar-login"}
= T("Login")
- else
%a{href: "{{=url('user.profile', current_user.id)}}"}
= T("Profile")
%a{href: "{{=url('main.account', 'logout')}}"}
= T("Logout")

1 comment on commit fbc1820

@mijdavis2
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DO NOT MERGE TO MASTER

Please sign in to comment.