Import new navbar design

This commit is contained in:
James Allen 2014-06-04 17:46:22 +01:00
parent 024e21e0ae
commit 72939e7dd8
15 changed files with 1872 additions and 3956 deletions

View file

@ -1,24 +0,0 @@
.sidebar-navigation(style="width: 180px; top: 40px")
ul
li(class = typeof projectTabActive != "undefined" ? "active" : "")
a(href="/project").tab-link.project-list-tab
.content Projects
li(class = typeof accountSettingsTabActive != "undefined" ? "active" : "")
a(href="/user/settings").tab-link.account-settings-tab
.content Account Settings
- if (settings.enableSubscriptions)
li(class = typeof subscriptionTabActive != "undefined" ? "active" : "")
a(href="/user/subscription").tab-link.subscription-tab
.content Subscription
- if (settings.enableSubscriptions)
.bonus-advert.ab-bonus-sidebar
.speech-bubble
h3
a(href="/user/bonus").plain-link Get free stuff!
p
a(href="/user/bonus").plain-link Recommend ShareLaTeX to your friends and we'll upgrade your account for free.
p
a(href="/user/bonus").btn.btn-success Get free stuff
img(src="/brand/logo/logo-64.png").lion

View file

@ -9,7 +9,7 @@ html(itemscope, itemtype='http://schema.org/Product')
- else
title= 'Online LaTeX Editor ShareLaTeX - ' +title
link(rel='stylesheet', href='/stylesheets/style.css?fingerprint='+fingerprint('/stylesheets/style.css'))
link(href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.min.css",rel="stylesheet")
link(href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css",rel="stylesheet")
meta(itemprop="name" ,content="ShareLaTeX - Real Time Online LaTeX Collaborative Editor in Your Browser")
meta(itemprop="description", content="Online LaTeX editor for collaborative editing, great for Maths or Sciences. You don't need to install LaTeX so it's great for beginners too.")
@ -30,13 +30,13 @@ html(itemscope, itemtype='http://schema.org/Product')
script(type='text/javascript')
window.ga = function() { console.log("Sending to GA", arguments) };
script
script(type="text/javscript").
window.csrfToken = "#{csrfToken}";
script(src=jsPath+'libs/jquery.js')
- if (typeof(bodyClasses) == "undefined")
bodyClasses = []
- var bodyClasses = []
body(class=bodyClasses)
include menubar
block content

View file

@ -1,39 +1,31 @@
nav.navbar.navbar-fixed-top.navbar-default
nav.navbar.navbar-default
.container-fluid
.navbar-header
button.navbar-toggle(data-toggle="collapse",data-target="#navbar-collapse")
i.fa.fa-bars
a(href='/').navbar-brand ShareLaTeX
.navbar-collapse.collapse
ul.nav.navbar-nav
.navbar-collapse.collapse#navbar-collapse
ul.nav.navbar-nav.navbar-right
-if(session && session.user)
li
a(href='/project') Projects
-if(typeof(tenderUrl) != "undefined")
li
a.js-tender-widget(href='#') Support & Feedback
li
a(href='/help') Help
li
a(href='/blog') Blog
li
a(href='/templates')#templatesLink LaTeX Templates
- if (settings.enableSubscriptions)
li.nav-collapse
a(href='/user/subscription/plans')#plansLink Plans & Pricing
li.dropdown.nav-collapse
a.dropdown-toggle(href='#',data-toggle="dropdown") Info
li.dropdown
a.dropdown-toggle(href='#',data-toggle="dropdown")
| Help
b.caret
ul.dropdown-menu
li.nav-collapse
a(href="/learn")#learnLink LaTeX help guide
li.nav-collapse
a(href='/resources')#resourcesLink LaTeX Resources
li.nav-collapse
a(href='/about')#aboutUsLink About Us
ul.nav.navbar-nav.navbar-right
li
a(href='/learn') Documentation
-if(typeof(tenderUrl) != "undefined")
li
a.js-tender-widget(href='#') Contact
-if(session && session.user)
li.dropdown
a.dropdown-toggle(href="#",data-toggle="dropdown") Account
a.dropdown-toggle(href="#",data-toggle="dropdown")
| Account
b.caret
ul.dropdown-menu
li

View file

@ -11,121 +11,182 @@ block content
-else
span Unknown?
mixin formatOwnerText(level, publicLevel)
-if (level == "owner")
span Me
-else
span #{formatProjectPublicAccessLevel()}  
mixin formatAccessLevel(project.accessLevel)
mixin tag(project_id, tagName, showDeleteIcon)
span.label.label-info.tag-label(data-project-id=project_id, data-tag=tagName)
span.text #{tagName}
span.text #{tagName}  
- if (showDeleteIcon)
i.icon-remove.icon-white.delete-tag(data-project-id=project_id, data-tag=tagName)
i.fa.fa-times.delete-tag(data-project-id=project_id, data-tag=tagName)
mixin projectList(projects)
-each project in projects
- project_id = project._id.toString()
.project_entry(id=project_id)
.btn-group.project-actions
a.btn.dropdown-toggle(data-toggle="dropdown", href="#") Actions
span.caret
ul.dropdown-menu.pull-right(role="menu")
li
a(href='/project/'+project_id+'/clone', data-csrf=csrfToken).cloneProject Clone
li
a(href='/project/'+project._id+'/download/zip').downloadZip Download Zip
-if (project.accessLevel == "owner")
li
a(href='/project/'+project_id+'/rename', data-name=project.name, data-id=project_id, data-csrf=csrfToken).renameProject Rename
li
a(href='/project/'+project_id, data-name=project.name, data-id=project_id, data-csrf=csrfToken).archiveProject Delete
-else
li
a(href='/project/'+project_id+'/leave', data-name=project.name, data-id=project_id, data-csrf=csrfToken).leaveProject Leave
li.project_entry(id=project_id)
label.checkbox.select-item
input(type="checkbox")
span.title
a.projectName(href="/project/#{project._id}") #{project.name}
.projectDetails
span Last modified on
span.isoDate #{project.lastUpdated.toISOString()}
span   -  
span #{formatProjectPublicAccessLevel(project.publicAccesLevel)}
span   -  
mixin formatAccessLevel(project.accessLevel)
.project-tags(data-project-id=project_id)
span.project-tags(data-project-id=project_id)
- each tag in project.tags
mixin tag(project_id, tag.name, true)
span.new-tags
span.newTagLocation
span.label.addTagButton(data-project-id=project_id) Add Tag
i.icon-plus.icon-white
span.owner
mixin formatOwnerText(project.accessLevel, project.publicAccesLevel)
span.last-modified.isoDate #{project.lastUpdated.toISOString()}
div
input(placeholder='Tag Name', name='tags', style="display: none;", data-project-id=project_id).tags-input
include ../general/sidebar
.content-with-navigation-sidebar
.box#projectListArea
.row-fluid
.span12
.page-header
.btn-group.pull-right#newProject
a.btn.btn-success.dropdown-toggle(data-toggle="dropdown", href="#") New Project
.container
.row
.col-md-2
br
#newProject.dropdown
a.btn.btn-primary.dropdown-toggle(data-toggle="dropdown", href="#") New Project
span.caret
ul.dropdown-menu.pull-right(role="menu")
ul.dropdown-menu(role="menu")
li
a.normalText#blankNewProject(href="#", data-csrf=csrfToken) Blank Project
a#blankNewProject(href="#", data-csrf=csrfToken) Blank Project
li
a.normalText#newProjectExample(href="#", data-csrf=csrfToken) Example Project
a#newProjectExample(href="#", data-csrf=csrfToken) Example Project
li
a.normalText#uploadNewProject(href="#", data-csrf=csrfToken) Upload Zipped Project
a#uploadNewProject(href="#", data-csrf=csrfToken) Upload Project
li.divider
li.dropdown-submenu
a(tabindex="-1", href="#", data-toggle="dropdown") Templates
ul.dropdown-menu
li
.normalText.menu-header From Template
a.menu-indent(href="/templates/cv") CV or Resume
li
a.normalText.menu-indent(href="/templates/cv") CV or Resume
a.menu-indent(href="/templates/cover-letters") Cover Letter
li
a.normalText.menu-indent(href="/templates/cover-letters") Cover Letter
a.menu-indent(href="/templates/journals") Journal Article
li
a.normalText.menu-indent(href="/templates/journals") Journal Article
a.menu-indent(href="/templates/presentations") Presentation
li
a.normalText.menu-indent(href="/templates/presentations") Presentation
a.menu-indent(href="/templates/thesis") Thesis
li
a.normalText.menu-indent(href="/templates/thesis") Thesis
a.menu-indent(href="/templates/bibliographies") Bibliographies
li
a.normalText.menu-indent(href="/templates/bibliographies") Bibliographies
a(href="/project/archived").pull-right.archived-projects Archived Projects
h1 Projects
- if (projects.length > 0)
.row-fluid
.span9
form.search
input#projectFilter(placeholder='Search Projects', autofocus='autofocus').span6.projectSearch.search-query
i.icon-search
i.icon-remove
ul#projectList
mixin projectList(projects)
a.menu-indent(href="/templates") View All »
.span3
.tag-list
h2 Tags
#allProjectTagsArea
ul
br
ul.unstyled.menu.js-folders-menu
li
a.normalText.menu-indent(href="#") All projects
li
a.normalText.menu-indent(href="#") Your projects
li
a.normalText.menu-indent(href="#") Shared with you
li Folders
li
a.normalText.menu-indent(href="#")
i.icon.fa.fa-folder-o
| PhD work
span.normalText (5)
li
a.normalText.menu-indent(href="#")
i.icon.fa.fa-folder-o
| Notes
span.normalText (2)
li
a.normalText.menu-indent(href="#")
i.icon.fa.fa-folder-o
| Papers
span.normalText (1)
ul.unstyled.menu
li
a.normalText.menu-indent(href="#")
i.icon.fa.fa-plus
| New Folder
-if (tags.length > 0)
hr.soften
ul#allProjectTagsArea.unstyled.menu
li Tags
- each tag in tags
-if (tag.project_ids.length > 0)
li
mixin tag("", tag.name, false)
span.number x #{tag.project_ids.length}
- else
-if (settings.enableSubscriptions)
p
a(href="/user/bonus").btn.btn-info Upgrade Account
.col-md-10
.row-fluid
.span12
.sharelatex-intro
.create-project-arrow Create your first project
form.form-inline.search.project-search
input#projectFilter(placeholder='Search projects…', autofocus='autofocus').span6.projectSearch.search-query
i.fa.fa-search
//- i.fa.fa-remove
.project-tools.js-toggle-tools.hidden
.btn-toolbar
.btn-group
a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/download/zip', data-toggle="tooltip", data-placement="bottom", title="", data-original-title="Download .zip File").btn.downloadZip
i.fa.fa-cloud-download
-if ("owner" == "owner")
a(href='/project/'+"5369c5737fc6b47f048da1f5", data-name="the project", data-id="5369c5737fc6b47f048da1f5", data-csrf=csrfToken, data-toggle="tooltip", data-placement="bottom", title="", data-original-title="Remove").btn.deleteProject
i.fa.fa-trash-o
a.btn.dropdown-toggle
i.fa.fa-folder-open-o
.btn-group.project-actions
a.btn.dropdown-toggle(data-toggle="dropdown", href="#") More
span.caret
ul.dropdown-menu.pull-right(role="menu")
li
a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/clone', data-csrf=csrfToken).cloneProject Make a Copy...
-if ("owner" == "owner")
li
a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/rename', data-name="the project", data-id="5369c5737fc6b47f048da1f5", data-csrf=csrfToken).renameProject Rename...
-else
li
a(href='/project/'+"5369c5737fc6b47f048da1f5"+'/leave', data-name="the project", data-id="5369c5737fc6b47f048da1f5", data-csrf=csrfToken).leaveProject Leave Project
.card.card-thin.first
- if (projects.length > 0)
ul#projectList
li
label.checkbox.select-all
input(type="checkbox")
span.title TITLE
span.owner OWNER
span.last-modified LAST MODIFIED
mixin projectList(projects)
- else
.row
.span12
.welcome
h2 Welcome to ShareLaTeX!
p New to LaTeX? Then have a look at our
h1
i.fa.fa-arrow-left
| Welcome! Follow the arrow to get started
p New to LaTeX? Start by having a look at our
a(href="/templates") templates
| or
a(href="/learn") help guides
| .
if freeTrial && !freeTrial.expired
.row-fluid
.span12
.alert.alert-info.alert-free-trial
h2 You are currently using a free trial which expires on #{freeTrial.expiresAt}.
p
a(href="/user/subscription").btn.btn-primary Upgrade now
if freeTrial && freeTrial.expired
.row-fluid
.span12
.alert.alert-danger.alert-free-trial
h2 Your free trial has expired!
p Upgrade now to continue using ShareLaTeX uninterrupted.
p
a(href="/user/subscription").btn.btn-danger Upgrade now
include ../general/small-footer
script(type="text/template")#tagTemplate
mixin tag('{{ project_id }}', '{{ tagName }}', true)
@ -141,4 +202,3 @@ block content
baseurl=jsPath,
src=jsPath+'libs/require.js?fingerprint='+fingerprint(jsPath + 'libs/require.js')
)

View file

@ -1,7 +1,7 @@
require [
"libs/jquery.validate"
"libs/fineuploader"
"libs/bootstrap/bootstrap2full"
"libs/bootstrap"
], ()->
$().ready ->

View file

@ -1,6 +1,6 @@
require [
"libs/jquery.storage"
"libs/bootstrap/bootstrap2full"
"libs/bootstrap"
], ()->
$('tr.clickable').click (event)->
window.location = $(event.target).closest('tr').attr("href")

View file

@ -1,5 +1,5 @@
define [
"libs/bootstrap/bootstrap2full"
"libs/bootstrap"
"forms"
], ()->
$(document).ready ()->

View file

@ -1,7 +1,7 @@
define [
"libs/backbone"
"libs/mustache"
"libs/bootstrap/bootstrap2full"
"libs/bootstrap"
], () ->
Modal = Backbone.View.extend {
templates:

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,36 +1,67 @@
.project-header {
.btn-group > .btn {
padding-left: @line-height-base / 2;
padding-right: @line-height-base / 2;
}
}
.project-search {
margin: @line-height-base 0;
}
.project-tools {
display: inline;
}
#projectList {
list-style-type: none;
height: 420px;
margin: 0;
.project_entry {
overflow: hidden;
overflow-y: scroll;
li {
border-bottom: 1px solid @gray-lighter;
padding: (@line-height-base / 4) 0;
&:first-child {
.last-modified, .owner {
font-size: 1rem;
}
}
&:last-child {
border-bottom: 0 none;
}
&:hover {
background-color: #eaeaea;
background-color: @gray-lighter;
}
min-height: 40px;
padding-left: 10px;
padding-top: 10px;
padding-bottom: 5px;
padding-right: 5px;
.project-actions{
float: right;
&:first-child:hover {
background-color: white;
}
.projectDetails {
padding-top: 5px;
padding-bottom: 5px;
color: #999;
font-size: 12px;
a {
color: lighten(@blue, 10%);
}
.select-item, .select-all, .title, .last-modified, .owner {
display: inline-block;
vertical-align: top;
margin-right: @line-height-base;
}
.select-item, .select-all {
margin-left: @line-height-base / 4;
}
.title {
width: 50%;
}
.last-modified, .owner {
font-size: .8rem;
width: 15%;
}
.owner {
margin-right: 0;
}
.projectName {
font-family: 'Chivo',sans-serif;
font-weight: bold;
font-size: 22px;
margin-right: @line-height-base;
}
}
.project_entry {
.tag-label {
margin-right: 5px;
font-size: 12px;
@ -41,301 +72,5 @@
}
margin-bottom: 5px;
}
.addTagButton {
font-size: 12px;
cursor: pointer;
&:hover {
background-color: #468847;
}
}
}
}
#projectFilter {
margin-left: 8px;
width: 250px;
margin-top: -4px;
margin-bottom: 4px;
}
#projectListArea {
.search {
position: relative;
}
.search .search-query {
padding-left: 29px;
}
.search {
input{
&:focus .icon-search {
background-image: url("/img/glyphicons-halflings-white.png")
}
}
.icon-search {
position: absolute;
top: 3px;
left: 18px;
}
.icon-remove {
position: absolute;
top: 3px;
left:280px;
}
}
.search .search-query:focus, .search .search-query.focused {
padding-left: 30px;
}
}
#newProject{
.dropdown-menu {
right: 0;
left: auto;
}
}
a.archived-projects {
padding: 6px 16px;
color: #aaa;
}
.project-actions {
float: right;
.dropdown-menu {
right:0;
left: auto;
}
}
.normalText{
font-size : 13px;
}
.clickable, #sections li{
cursor: pointer;
cursor: hand;
}
.tag-list {
border-left: 1px solid #D9D9D9;
padding-left: 16px;
#allProjectTagsArea {
ul {
list-style:none;
margin: 0;
li {
margin: 8px 3px;
}
}
.number {
padding-left:5px;
font-size: 12px;
color: #999;
}
}
}
.twitter-typeahead .tt-query,
.twitter-typeahead .tt-hint {
margin-bottom: 0;
}
.tt-dropdown-menu {
min-width: 160px;
margin-top: 2px;
padding: 5px 0;
background-color: #fff;
border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.2);
*border-right-width: 2px;
*border-bottom-width: 2px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
-webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
-moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
box-shadow: 0 5px 10px rgba(0,0,0,.2);
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
}
.tt-suggestion {
display: block;
padding: 3px 20px;
}
.tt-suggestion.tt-is-under-cursor {
color: #fff;
background-color: #0081c2;
background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
background-image: -o-linear-gradient(top, #0088cc, #0077b3);
background-image: linear-gradient(to bottom, #0088cc, #0077b3);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0)
}
.tt-suggestion.tt-is-under-cursor a {
color: #fff;
}
.tt-suggestion p {
margin: 0;
}
.sharelatex-intro {
position: relative;
padding-top: 60px;
.create-project-arrow {
color: #666;
position: absolute;
top: 0;
right: 0;
font-size: 24px;
padding: 50px 55px 0 0;
margin-right: 20px;
margin-top: -30px;
background-image: url(/img/upwards-sweeping-arrow.png);
background-repeat: no-repeat;
background-position: top right;
}
.welcome {
width: 350px;
margin: auto;
background-image: url(/brand/logo/logo-128.png);
background-position: top center;
background-repeat: no-repeat;
h2 {
font-size: 24px;
margin-bottom: 6px;
}
p {
font-size: 18px;
line-height: 22px;
}
padding-top: 130px;
text-align: center;
margin-bottom: 60px;
}
}
.content-with-navigation-sidebar {
padding-left: 200px;
padding-right: 20px;
}
.sidebar-navigation {
background: rgb(40,40,40);
border-right: 1px solid #999;
position: fixed;
left: 0;
top: 0;
bottom: 0;
width: 40px;
overflow: hidden;
z-index: 10;
ul {
list-style: none;
margin: 0;
li {
a {
color: #ccc;
width: 100%;
display: block;
.content {
padding: 12px 0;
}
&:hover {
.box-shadow(inset 0 0 15px #111);
text-decoration: none;
color: white;
}
}
}
li.active {
background-color: blue;
a {
color: white;
&:hover {
.box-shadow(none);
}
}
}
}
.image-button {
margin-top: 4px;
margin-right: 8px;
cursor: pointer;
}
a.tab-link {
background-position: 12px center;
background-repeat: no-repeat;
padding-left: 40px;
height: 40px;
}
a.code-tab {
background-image: url(/brand/icons/code.png);
}
a.history-tab {
background-image: url(/brand/icons/history.png);
}
a.settings-tab, a.account-settings-tab {
background-image: url(/brand/icons/settings.png);
}
a.collaborators-tab {
background-image: url(/brand/icons/collaborators.png);
}
a.project-list-tab {
background-image: url(/brand/icons/projects.png);
}
a.subscription-tab {
background-image: url(/brand/icons/subscription.png);
}
#toolbar-footer {
position: absolute;
bottom: 0;
left: 0;
width: 180px;
padding-bottom: 16px;
text-align: center;
a {
font-size: 12px;
color: #ddd;
&:hover {
color: white;
}
}
> div {
margin-top: 3px;
}
}
}

View file

@ -12,7 +12,7 @@
position: relative;
min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: @navbar-margin-bottom;
border: 1px solid transparent;
border-bottom: 1px solid transparent;
// Prevent floats from breaking the navbar
&:extend(.clearfix all);
@ -379,6 +379,8 @@
.navbar-default {
background-color: @navbar-default-bg;
border-color: @navbar-default-border;
height: 73px;
padding: 1rem 2rem;
.navbar-brand {
color: @navbar-default-brand-color;
@ -396,11 +398,19 @@
.navbar-nav {
> li > a {
color: @navbar-default-link-color;
border: 2px solid @navbar-default-link-color;
border-radius: 3px;
font-size: @font-size-base * .8;
font-weight: 700;
line-height: 1;
margin-left: 1rem;
padding: 10px 10px 11px;
&:hover,
&:focus {
color: @navbar-default-link-hover-color;
color: #fff;
background-color: @navbar-default-link-hover-bg;
border: 2px solid @navbar-default-link-hover-color;
}
}
> .active > a {
@ -493,124 +503,3 @@
}
}
// Inverse navbar
.navbar-inverse {
background-color: @navbar-inverse-bg;
border-color: @navbar-inverse-border;
.navbar-brand {
color: @navbar-inverse-brand-color;
&:hover,
&:focus {
color: @navbar-inverse-brand-hover-color;
background-color: @navbar-inverse-brand-hover-bg;
}
}
.navbar-text {
color: @navbar-inverse-color;
}
.navbar-nav {
> li > a {
color: @navbar-inverse-link-color;
&:hover,
&:focus {
color: @navbar-inverse-link-hover-color;
background-color: @navbar-inverse-link-hover-bg;
}
}
> .active > a {
&,
&:hover,
&:focus {
color: @navbar-inverse-link-active-color;
background-color: @navbar-inverse-link-active-bg;
}
}
> .disabled > a {
&,
&:hover,
&:focus {
color: @navbar-inverse-link-disabled-color;
background-color: @navbar-inverse-link-disabled-bg;
}
}
}
// Darken the responsive nav toggle
.navbar-toggle {
border-color: @navbar-inverse-toggle-border-color;
&:hover,
&:focus {
background-color: @navbar-inverse-toggle-hover-bg;
}
.icon-bar {
background-color: @navbar-inverse-toggle-icon-bar-bg;
}
}
.navbar-collapse,
.navbar-form {
border-color: darken(@navbar-inverse-bg, 7%);
}
// Dropdowns
.navbar-nav {
> .open > a {
&,
&:hover,
&:focus {
background-color: @navbar-inverse-link-active-bg;
color: @navbar-inverse-link-active-color;
}
}
@media (max-width: @grid-float-breakpoint-max) {
// Dropdowns get custom display
.open .dropdown-menu {
> .dropdown-header {
border-color: @navbar-inverse-border;
}
.divider {
background-color: @navbar-inverse-border;
}
> li > a {
color: @navbar-inverse-link-color;
&:hover,
&:focus {
color: @navbar-inverse-link-hover-color;
background-color: @navbar-inverse-link-hover-bg;
}
}
> .active > a {
&,
&:hover,
&:focus {
color: @navbar-inverse-link-active-color;
background-color: @navbar-inverse-link-active-bg;
}
}
> .disabled > a {
&,
&:hover,
&:focus {
color: @navbar-inverse-link-disabled-color;
background-color: @navbar-inverse-link-disabled-bg;
}
}
}
}
}
.navbar-link {
color: @navbar-inverse-link-color;
&:hover {
color: @navbar-inverse-link-hover-color;
}
}
}

View file

@ -20,7 +20,7 @@
// Body reset
html {
font-size: 62.5%;
//font-size: 62.5%;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}

View file

@ -7,19 +7,29 @@
//
//## Gray and brand colors for use across Bootstrap.
@gray-darker: lighten(#000, 13.5%); // #222
@gray-dark: lighten(#000, 20%); // #333
@gray: lighten(#000, 33.5%); // #555
@gray-light: lighten(#000, 60%); // #999
@gray-lighter: lighten(#000, 93.5%); // #eee
@brand-primary: #428bca;
@brand-success: #5cb85c;
@brand-info: #5bc0de;
@brand-warning: #f0ad4e;
@gray-darker: #252525;
@gray-dark: #505050;
@gray: #7a7a7a;
@gray-light: #a4a4a4;
@gray-lighter: #cfcfcf;
@gray-lightest: #f0f0f0;
@blue: #263872;
@blueDark: #040D2D;
@green: #46a546;
@red: #a93529;
@yellow: #A1A729;
@orange: #f89406;
@pink: #c3325f;
@purple: #7a43b6;
@brand-primary: @red;
@brand-success: @green;
@brand-info: @blue;
@brand-warning: @orange;
@brand-danger: #d9534f;
//== Scaffolding
//
// ## Settings for some of the most global styles.
@ -40,12 +50,12 @@
//## Font, line-height, and color for body text, headings, and more.
@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-serif: "PT Serif", Georgia, Times, serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
@font-size-base: 1rem;
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
@ -57,7 +67,7 @@
@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
//** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
@line-height-base: 1.5625; // 20/14
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
@ -326,23 +336,23 @@
//##
// Basics of a navbar
@navbar-height: 50px;
@navbar-height: 60px;
@navbar-margin-bottom: @line-height-computed;
@navbar-border-radius: @border-radius-base;
@navbar-border-radius: 0;
@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
@navbar-collapse-max-height: 340px;
@navbar-default-color: #777;
@navbar-default-bg: #f8f8f8;
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
@navbar-default-bg: #fff;
@navbar-default-border: @gray-lighter;
// Navbar links
@navbar-default-link-color: #777;
@navbar-default-link-hover-color: #333;
@navbar-default-link-hover-bg: transparent;
@navbar-default-link-active-color: #555;
@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%);
@navbar-default-link-color: @link-color;
@navbar-default-link-hover-color: @link-hover-color;
@navbar-default-link-hover-bg: @link-hover-color;
@navbar-default-link-active-color: #fff;
@navbar-default-link-active-bg: @link-hover-color;
@navbar-default-link-disabled-color: #ccc;
@navbar-default-link-disabled-bg: transparent;
@ -356,33 +366,6 @@
@navbar-default-toggle-icon-bar-bg: #888;
@navbar-default-toggle-border-color: #ddd;
// Inverted navbar
// Reset inverted navbar basics
@navbar-inverse-color: @gray-light;
@navbar-inverse-bg: #222;
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
// Inverted navbar links
@navbar-inverse-link-color: @gray-light;
@navbar-inverse-link-hover-color: #fff;
@navbar-inverse-link-hover-bg: transparent;
@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 10%);
@navbar-inverse-link-disabled-color: #444;
@navbar-inverse-link-disabled-bg: transparent;
// Inverted navbar brand label
@navbar-inverse-brand-color: @navbar-inverse-link-color;
@navbar-inverse-brand-hover-color: #fff;
@navbar-inverse-brand-hover-bg: transparent;
// Inverted navbar toggle
@navbar-inverse-toggle-hover-bg: #333;
@navbar-inverse-toggle-icon-bar-bg: #fff;
@navbar-inverse-toggle-border-color: #333;
//== Navs
//
//##

View file

@ -17,7 +17,7 @@
@import "components/buttons.less";
@import "components/code.less";
@import "components/component-animations.less";
@import "components/glyphicons.less";
//@import "components/glyphicons.less";
@import "components/dropdowns.less";
@import "components/button-groups.less";
@import "components/input-groups.less";