0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-16 06:13:34 +00:00

working on navbar

(cherry picked from commit 5072c2b)
This commit is contained in:
Daniel Samson 2016-11-17 14:48:56 +00:00
parent 7aa90fe07e
commit 424939729e
7 changed files with 653 additions and 592 deletions

View file

@ -53,6 +53,11 @@ a:hover {
}
::selection {background: $selection-bg;color:$selection-color;} /* Safari */
::-moz-selection {background: $selection-bg;color:$selection-color;} /* Firefox */
@media (max-width: 750px) {
#bootstrap-container {

View file

@ -43,7 +43,7 @@
padding: 12px 15px 12px 15px;
display: block;
font-size: 14px;
border-bottom: 1px solid #757083;
border-bottom: 1px solid $navbar-menu-seperator;
text-transform: none;
letter-spacing: 0;
margin: 0;
@ -103,21 +103,24 @@
> span.notCurrentTab {
> a {
display: inline-block;
border-top: 3px solid transparent;
padding-top: 36px;
padding-bottom: 35px;
//padding-top: 36px;
//padding-bottom: 35px;
}
> a:hover {
background-color: $navbar-main-menu-bg;
border-top: 3px solid $navbar-menu-current-seperator;
}
}
> span.currentTab {
> a {
display: inline-block;
border-top: 3px solid $navbar-menu-current-seperator;
padding-top: 36px;
padding-bottom: 35px;
//padding-top: 36px;
//padding-bottom: 35px;
}
}
@ -404,12 +407,18 @@
}
.topnav:hover > a {
border-top: 3px solid $navbar-menu-link-color-hover;
.topnav a {
color: $navbar-link-color;
}
.topnav:hover {
background-color: $navbar-main-menu-bg;
color: $navbar-link-color-hover;
}
.topnav a:hover {
color: $navbar-menu-link-color-hover;
color: $navbar-link-color-hover;
}
.topnav ul.dropdown-menu li:last-child a {
@ -487,7 +496,7 @@ li#usermenu a {
}
li#usermenu a:hover {
color: $navbar-menu-link-color-hover;
color: $navbar-menu-link-color;
}
#globalLinks {
@ -535,9 +544,9 @@ li#usermenu a span.caret {
background-position: 0 0;
}
li#usermenu a:hover span.caret {
background-position: 0 -48px;
}
//li#usermenu a:hover span.caret {
// background-position: 0 -48px;
//}
li#usermenu a span.user_icon {
height: 42px;
@ -551,9 +560,9 @@ li#usermenu a span.user_icon {
margin-top: -12px;
}
li#usermenu a:hover span.user_icon {
background-position: 0 -99px;
}
//li#usermenu a:hover span.user_icon {
// background-position: 0 -99px;
//}
@ -770,8 +779,7 @@ li#usermenu a:hover span.user_icon {
a[id^=grouptab], a[id^=moduleTab] {
color: $navbar-menu-link-color;
padding: 15px 0 18px 0;
color: $navbar-link-color;
}
a[id^=grouptab]:visited {
@ -847,11 +855,11 @@ a[id^=grouptab]:active {
}
#quickcreatetop a {
color: $navbar-menu-link-color ;
color: $navbar-quick-create-link-color ;
text-align: center;
padding: 11px 32px 12px 12px;
border-radius: 3px;
background-color: $quick-create-btn-bg;
background-color: $navbar-quick-create-btn-bg;
font-size: 13px;
text-transform: uppercase;
letter-spacing: 2px;
@ -864,8 +872,8 @@ a[id^=grouptab]:active {
#quickcreatetop a:hover {
cursor: pointer;
background-color: $quick-create-btn-bg-hover;
background-position: 80px -56px;
background-color: $navbar-quick-create-btn-bg-hover;
//background-position: 80px -56px;
text-decoration: none;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
@ -924,9 +932,9 @@ a[id^=grouptab]:active {
left: auto;
}
#desktop_notifications:hover {
background-position: 0px -100px;
}
//#desktop_notifications:hover {
// background-position: 0px -100px;
//}
#desktop_notifications a {
cursor: pointer;
@ -956,7 +964,7 @@ a[id^=grouptab]:active {
#desktop_notifications span.alert_count {
background-color: $navbar-alert-count-bg;
line-height: 20px;
color: $navbar-menu-link-color;
color: $navbar-alert-count-link-color;
height: 20px;
width: 20px;
display: block;
@ -1018,10 +1026,10 @@ a[id^=grouptab]:active {
}
#desktop_notifications div.has-alerts .alert-info {
color: $navbar-menu-link-color;
color: $navbar-alert-link-color;
background-color: inherit;
border: 1px solid $navbar-menu-seperator;
border: 1px solid $navbar-alert-seperator;
border-radius: 2px;
padding: 0;
}
@ -1055,7 +1063,7 @@ a[id^=grouptab]:active {
#desktop_notifications div.has-alerts h4 {
font-size: 14px;
font-weight: bold;
background-color: $navbar-main-menu-bg;
background-color: $navbar-alert-title-bg;
line-height: 20px;
border-top-left-radius: 2px;
border-top-right-radius: 2px;
@ -1146,9 +1154,9 @@ a[id^=grouptab]:active {
overflow: hidden;
}
#searchformdropdown button:hover {
background-position: 13px -44px;
}
//#searchformdropdown button:hover {
// background-position: 13px -44px;
//}
#search > .dropdown-menu {
background-color: transparent;
@ -1179,9 +1187,9 @@ a[id^=grouptab]:active {
margin-left: 0px;
}
#usermenucollapsed, #usermenucollapsed-mobile:hover {
background-position: 0 -99px;
}
//#usermenucollapsed, #usermenucollapsed-mobile:hover {
// background-position: 0 -99px;
//}
#content {
width: 99%;
@ -1211,13 +1219,13 @@ a[id^=grouptab]:active {
#quickcreatetop a {
padding: 5px 32px 5px 12px;
background-color: $quick-create-mobile-btn-bg;
background-color: $navbar-quick-create-mobile-btn-bg;
background-position: 80px -5px;
}
#quickcreatetop a:hover {
background-position: 80px -5px;
}
//#quickcreatetop a:hover {
// background-position: 80px -5px;
//}
#search {
position: relative;
@ -1303,8 +1311,7 @@ a[id^=grouptab]:active {
width: 28px;
height: 28px;
margin-right: 20px;
background-image: none, url("../../../../themes/SuiteP/images/p_icon_alert_small.svg"), url("../../../../themes/SuiteP/images/p_icon_alert_small.png");
background-repeat: no-repeat;
background-image: none, url("../../../../index.php?entryPoint=getImage&themeName=SuiteP&imageName=p_icon_alert_small.svg"), url("../../../../index.php?entryPoint=getImage&themeName=SuiteP&imageName=p_icon_alert_small.png");
background-position: 0px 0px;
}
}
@ -1364,9 +1371,9 @@ a[id^=grouptab]:active {
background-position: 80px 2px;
}
#quickcreatetop a:hover {
background-position: 80px -56px;
}
//#quickcreatetop a:hover {
// background-position: 80px -56px;
//}
#quickcreatetop ul.dropdown-menu {
left: 0px;
@ -1389,9 +1396,9 @@ a[id^=grouptab]:active {
background-position: 0 0;
}
#usermenucollapsed:hover {
background-position: 0 -99px;
}
//#usermenucollapsed:hover {
// background-position: 0 -99px;
//}
#desktop_notifications {
@ -1405,9 +1412,9 @@ a[id^=grouptab]:active {
background-position: 0px 0px;
}
#desktop_notifications:hover {
background-position: 0px -100px;
}
//#desktop_notifications:hover {
// background-position: 0px -100px;
//}
#search {
margin-right: 8px;
@ -1456,10 +1463,10 @@ a[id^=grouptab]:active {
background-color: transparent;
}
#searchbutton:hover {
background-position: 0px 8px;
background-color: transparent;
}
//#searchbutton:hover {
// background-position: 0px 8px;
// background-color: transparent;
//}
}
@ -1497,7 +1504,7 @@ a[id^=grouptab]:active {
float: left;
width: 300px ;
margin: 0;
padding: 0;
padding: 4px 10px 4px 10px;
background: $navbar-main-menu-bg ;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
@ -1676,9 +1683,9 @@ a[id^=grouptab]:active {
#mobilegloballinks {
display: inline;
}
#usermenucollapsed:hover {
background-position: 0 0px;
}
//#usermenucollapsed:hover {
// background-position: 0 0px;
//}
}
@ -1772,9 +1779,9 @@ a[id^=grouptab]:active {
overflow: hidden;
}
#searchformdropdown button:hover {
background-position: 13px -44px;
}
//#searchformdropdown button:hover {
// background-position: 13px -44px;
//}
#search #query_string {
background-color: $navbar-search-bg;

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

View file

@ -15,6 +15,9 @@ $info: #AA9DCC;
$main-bg: #F5F5F5;
$main-alternate-bg: #FFFFFF;
$selection-color: #F08377;
$selection-bg: #534d64;
$page-font-family: 'Lato', Lato, Arial, sans-serif;
$page-font-size: 13px;
$page-p-size: 14px;
@ -55,24 +58,31 @@ $disabled-btn-bg: #777777;
// Navbar
$navbar-bg: #534D64;
$navbar-main-menu-bg: #5D5670;
$navbar-menu-link-color: #FFFFFF;
$navbar-menu-link-color-hover: #F08377;
$navbar-menu-seperator: #757083;
$navbar-menu-current-seperator: $danger;
$navbar-bg: #3C8DBC;
$navbar-link-color: #FFFFFF;
$navbar-link-color-hover: #97c6e1;
$navbar-main-menu-bg: #4b4b4b;
$navbar-menu-link-color: #3C8DBC;
$navbar-menu-link-color-hover: #49ade6;
$navbar-menu-seperator: #97c6e1;
$navbar-menu-current-seperator: #FFFFFF;
$navbar-search-bg: #65697A;
$navbar-search-btn-bg: #829EB5;
$navbar-search-text-color: #A2A5AF;
$navbar-search-color: #817D8D;
$quick-create-mobile-btn-bg: #A2B2BF;
$quick-create-btn-bg: #A2B2BF;
$quick-create-menu-bg: #829EB5;
$quick-create-btn-bg-hover: $quick-create-menu-bg;
$navbar-quick-create-link-color: #FFFFFF;
$navbar-quick-create-mobile-btn-bg: #A2B2BF;
$navbar-quick-create-btn-bg: #A2B2BF;
$navbar-quick-create-menu-bg: #829EB5;
$navbar-quick-create-btn-bg-hover: $navbar-quick-create-menu-bg;
$navbar-alert-count-link-color: #FFFFFF;
$navbar-alert-link-color: #FFFFFF;
$navbar-alert-body-color: #000000;
$navbar-alert-title-bg: #000000;
$navbar-alert-seperator: $navbar-menu-seperator;
$navbar-alert-count-bg: #F08377;
$mobile-navbar-toolbar-bg: #A2B2BF;

Binary file not shown.

Before

(image error) Size: 309 B

After

(image error) Size: 266 B

View file

@ -1,13 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="10px" height="58px" viewBox="0 0 10 58" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background: #534D64;">
<!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
<title>p_icon_caret</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="p_icon_caret">
<polygon id="Triangle-21" fill="#FFFFFF" points="1 1 9 1 5 9"></polygon>
<polygon id="Triangle-21" fill="#F08377" points="1 49 9 49 5 57"></polygon>
</g>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="10px"
height="58px"
viewBox="0 0 10 58"
version="1.1"
style="background: #534D64;"
id="svg2"
inkscape:version="0.91 r13725"
sodipodi:docname="p_icon_caret.svg"
inkscape:export-filename="/home/daniel/Projects/salesagility/suitecrm-suitep/themes/SuiteP/images/p_icon_caret.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<metadata
id="metadata17">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="747"
inkscape:window-height="480"
id="namedview15"
showgrid="false"
inkscape:zoom="4.0689655"
inkscape:cx="5"
inkscape:cy="29"
inkscape:window-x="939"
inkscape:window-y="194"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
<title
id="title4">p_icon_caret</title>
<desc
id="desc6">Created with Sketch.</desc>
<defs
id="defs8" />
<g
id="Page-1"
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd">
<g
id="p_icon_caret">
<polygon
id="Triangle-21"
fill="#FFFFFF"
points="1 1 9 1 5 9" />
<polygon
id="polygon13"
fill="#F08377"
points="1 49 9 49 5 57" />
</g>
</svg>
</g>
</svg>

Before

(image error) Size: 715 B

After

(image error) Size: 2.1 KiB