Skip to content

Commit

Permalink
Merge branch 'hotfix/modal'
Browse files Browse the repository at this point in the history 
* hotfix/modal:
  Fix image paths, css and add missing file
  • Loading branch information
Gustavo Cunha committed Oct 27, 2014
2 parents c427b2a + 012bf43 commit 5f23f9e
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 30 deletions.
Binary file added app/assets/images/website/ui-bg_highlight-soft_100_eeeeee_1x100.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/assets/stylesheets/contact.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
padding-bottom:0px !important;
}
.mapArea{
background:url(website/map-bro.png) repeat-x 0 0;
background:url(/assets/website/map-bro.png) repeat-x 0 0;
padding-top:4px;
height:400px;
overflow:hidden;
Expand All @@ -41,7 +41,7 @@
width:100%;
height:396px;
padding-bottom: 4px;
background:url(website/map-bro.png) repeat-x 0 100%;
background:url(/assets/website/map-bro.png) repeat-x 0 100%;
}


Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/educational.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@


.education .arrowpart{
background:url(website/arrow-left-light.png) no-repeat 0 23px;
background:url(/assets/website/arrow-left-light.png) no-repeat 0 23px;
}
.education .exCon{
background:#fafafa;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/header.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ header{
}

.bannerPart{
/*background:url(website/1.jpg) no-repeat 0 0;*/
/*background:url(/assets/website/1.jpg) no-repeat 0 0;*/
height:100%;
overflow:hidden;
}
Expand Down
34 changes: 17 additions & 17 deletions app/assets/stylesheets/jquery-ui.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,26 @@
.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(website/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(/assets/website/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
.ui-widget-content a { color: #333333; }
.ui-widget-header { border: 1px solid #181b22; background: #181b22 ; color: #ffffff; font-weight: bold; }
.ui-widget-header a { color: #ffffff; }

/* Interaction states
----------------------------------*/
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(website/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(/assets/website/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(website/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(/assets/website/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(website/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(/assets/website/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
.ui-widget :active { outline: none; }

/* Interaction Cues
----------------------------------*/
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(website/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(/assets/website/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(website/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(/assets/website/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
Expand All @@ -89,23 +89,23 @@
----------------------------------*/

/* states and images */
.ui-icon { width: 28px; height: 28px; background-image: url(website/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(website/ui-icons_222222_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(../closebutton.png); }
.ui-state-default .ui-icon { background-image: url(website/ui-icons_ef8c08_256x240.png); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(website/ui-icons_ef8c08_256x240.png); }
.ui-state-active .ui-icon {background-image: url(website/ui-icons_ef8c08_256x240.png); }
.ui-state-highlight .ui-icon {background-image: url(../closebutton.png); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(website/ui-icons_ffd27a_256x240.png); }
.ui-icon { width: 28px; height: 28px; background-image: url(/assets/website/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(/assets/website/ui-icons_222222_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(/assets/website/closebutton.png); }
.ui-state-default .ui-icon { background-image: url(/assets/website/ui-icons_ef8c08_256x240.png); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(/assets/website/ui-icons_ef8c08_256x240.png); }
.ui-state-active .ui-icon {background-image: url(/assets/website/ui-icons_ef8c08_256x240.png); }
.ui-state-highlight .ui-icon {background-image: url(/assets/website/closebutton.png); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(/assets/website/ui-icons_ffd27a_256x240.png); }

/* positioning */
.ui-icon-carat-1-n { background-position: 0 0; }
.ui-icon-carat-1-ne { background-position: -16px 0; }
.ui-icon-carat-1-e { background:url(../right-arrow.png) 50% 50% no-repeat !important; width:32px !important; height:40px !important; }
.ui-icon-carat-1-e { background:url(/assets/website/right-arrow.png) 50% 50% no-repeat !important; width:32px !important; height:40px !important; }
.ui-icon-carat-1-se { }
.ui-icon-carat-1-s { background-position: -64px 0; }
.ui-icon-carat-1-sw { }
.ui-icon-carat-1-w { background:url(../left-arrow.png) 50% 50% no-repeat !important; width:32px !important; height:40px !important; }
.ui-icon-carat-1-w { background:url(/assets/website/left-arrow.png) 50% 50% no-repeat !important; width:32px !important; height:40px !important; }
.ui-icon-carat-1-nw { background-position: -112px 0; }
.ui-icon-carat-2-n-s { background-position: -128px 0; }
.ui-icon-carat-2-e-w { background-position: -144px 0; }
Expand Down Expand Up @@ -287,7 +287,7 @@

/* Overlays */
.ui-widget-overlay { background: #000; opacity: .70;filter:Alpha(Opacity=70); z-index:15 }
.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(website/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(/assets/website/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
* jQuery UI Resizable 1.8.16
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/lightbox.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@
z-index:110;
}
.ui-lightbox-panorama-icon-expand {
background:url(website/zoom.png) top left no-repeat;
background:url(/assets/website/zoom.png) top left no-repeat;
}
.ui-lightbox-panorama-icon-expand-hover {
background:url(website/zoom.png) top left no-repeat;
background:url(/assets/website/zoom.png) top left no-repeat;
}
.ui-lightbox-panorama-icon-shrink {
background:url(website/zoom-hover.png) top right no-repeat;
background:url(/assets/website/zoom-hover.png) top right no-repeat;
}
.ui-lightbox-panorama-icon-shrink-hover {
background:url(website/zoom-hover.png) top right no-repeat;
background:url(/assets/website/zoom-hover.png) top right no-repeat;
}
.ui-lightbox-loader {
background:url(loader.gif) center center no-repeat;
background:url(/assets/website/ajax-loader.gif) center center no-repeat;
}
#ui-lightbox-bottombar {
margin-top:5px;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/responsive.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@
float:none;
width:100%;
height:40px;
background:url(website/arrow-top.png) no-repeat 50% 100%;
background:url(/assets/website/arrow-top.png) no-repeat 50% 100%;
}
.education .arrowpart{
background:url(website/arrow-top-light.png) no-repeat 50% 100%;
background:url(/assets/website/arrow-top-light.png) no-repeat 50% 100%;
}
.exCon{
margin-left:0px;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/technical.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@


.skilBg{
background:url(website/skills.png) no-repeat 0 0;
background:url(/assets/website/skills.png) no-repeat 0 0;
}


Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/work.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
float:left;
width:15px;
height:50px;
background:url(website/arrow-left.png) no-repeat 0 23px;
background:url(/assets/website/arrow-left.png) no-repeat 0 23px;
}
.exCon{
width:auto;
Expand Down

0 comments on commit 5f23f9e

Please sign in to comment.