Skip to content

Riina Antikainen / Moya

Go to a project
Commit 44509956 by Tuomas Riihimäki
Options

Merge branch 'newtemplate' into 'master' 

Newtemplate

Muokattu oikean ylänurkan moya-logon linkki aukeamaan uuteen ikkunaan ja lisättyä paddingia siirtämään logo pois reunoista

See merge request !315
2 parents 6e74cbc3 cf503b46
Inline Side-by-side
Showing with 3 additions and 1 deletions
code/moya-web/WebContent/resources/primefaces-moyakasa/theme.css 0 → 100644
/** jQuery UI CSS Framework* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.* To view and modify this theme, visit http://jqueryui.com/themeroller/*//* Component containers----------------------------------*/.ui-widget{font-family:Helvetica Neue,Helvetica,Arial,sans-serif/*{ffDefault}*/;font-size:1.1em/*{fsDefault}*/;}.ui-widget .ui-widget{font-size:1em;}.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button{font-family:Verdana,Arial,sans-serif/*{ffDefault}*/;font-size:1em;}.ui-widget-content{border:1px solid #bbb1aa/*{borderColorContent}*/;background:#ffffff/*{bgColorContent}*/ url("#{resource['primefaces-casablanca:images/ui-bg_flat_75_ffffff_40x100.png']}") /*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/;color:#222222/*{fcContent}*/;}.ui-widget-content a{color:#222222/*{fcContent}*/;}.ui-widget-header{border:1px solid #cbc3be/*{borderColorHeader}*/;background:#ffffff/*{bgColorHeader}*/ url("#{resource['primefaces-casablanca:images/header.png']}") /*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;color:#222222/*{fcHeader}*/;font-weight:bold;}.ui-widget-header a{color:#222222/*{fcHeader}*/;}/* Interaction states----------------------------------*/.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default{border:1px solid #cbc3be/*{borderColorDefault}*/;background:#e6e6e6/*{bgColorDefault}*/ url("#{resource['primefaces-casablanca:images/default.png']}") /*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/;font-weight:normal/*{fwDefault}*/;color:#000000/*{fcDefault}*/;}.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited{color:#000000/*{fcDefault}*/;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 #b4a9a0/*{borderColorHover}*/;background:#dadada/*{bgColorHover}*/ url("#{resource['primefaces-casablanca:images/hover.png']}")/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/;font-weight:normal/*{fwDefault}*/;color:#000000/*{fcHover}*/;}.ui-state-hover a, .ui-state-hover a:hover{color:#000000/*{fcHover}*/;text-decoration:none;}.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active{border:1px solid #aaaaaa/*{borderColorActive}*/;background:#ffffff/*{bgColorActive}*/ url("#{resource['primefaces-casablanca:images/active.png']}")/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/;font-weight:normal/*{fwDefault}*/;color:#000000/*{fcActive}*/;}.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited{color:#000000/*{fcActive}*/;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 #fcefa1/*{borderColorHighlight}*/;background:#fbf9ee/*{bgColorHighlight}*/ url("#{resource['primefaces-casablanca:images/ui-bg_glass_55_fbf9ee_1x400.png']}") /*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/;color:#363636/*{fcHighlight}*/;}.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636/*{fcHighlight}*/;}.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error{border:1px solid #cd0a0a/*{borderColorError}*/;background:#fef1ec/*{bgColorError}*/ url("#{resource['primefaces-casablanca:images/ui-bg_glass_95_fef1ec_1x400.png']}") /*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/;color:#cd0a0a/*{fcError}*/;}.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a{color:#cd0a0a/*{fcError}*/;}.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text{color:#cd0a0a/*{fcError}*/;}.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary{font-weight:bold;}.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal;}.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none;}/* Icons----------------------------------*//* states and images */.ui-icon{width:16px;height:16px;background-image:url("#{resource['primefaces-casablanca:images/ui-icons_222222_256x240.png']}")/*{iconsContent}*/;}.ui-widget-content .ui-icon{background-image:url("#{resource['primefaces-casablanca:images/ui-icons_222222_256x240.png']}")/*{iconsContent}*/;}.ui-widget-header .ui-icon{background-image:url("#{resource['primefaces-casablanca:images/ui-icons_222222_256x240.png']}")/*{iconsHeader}*/;}.ui-state-default .ui-icon{background-image:url("#{resource['primefaces-casablanca:images/ui-icons_888888_256x240.png']}")/*{iconsDefault}*/;}.ui-state-hover .ui-icon, .ui-state-focus .ui-icon{background-image:url("#{resource['primefaces-casablanca:images/ui-icons_454545_256x240.png']}")/*{iconsHover}*/;}.ui-state-active .ui-icon{background-image:url("#{resource['primefaces-casablanca:images/ui-icons_454545_256x240.png']}")/*{iconsActive}*/;}.ui-state-highlight .ui-icon{background-image:url("#{resource['primefaces-casablanca:images/ui-icons_2e83ff_256x240.png']}")/*{iconsHighlight}*/;}.ui-state-error .ui-icon, .ui-state-error-text .ui-icon{background-image:url("#{resource['primefaces-casablanca:images/ui-icons_cd0a0a_256x240.png']}")/*{iconsError}*/;}/* 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-position:-32px 0;}.ui-icon-carat-1-se{background-position:-48px 0;}.ui-icon-carat-1-s{background-position:-64px 0;}.ui-icon-carat-1-sw{background-position:-80px 0;}.ui-icon-carat-1-w{background-position:-96px 0;}.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;}.ui-icon-triangle-1-n{background-position:0 -16px;}.ui-icon-triangle-1-ne{background-position:-16px -16px;}.ui-icon-triangle-1-e{background-position:-32px -16px;}.ui-icon-triangle-1-se{background-position:-48px -16px;}.ui-icon-triangle-1-s{background-position:-64px -16px;}.ui-icon-triangle-1-sw{background-position:-80px -16px;}.ui-icon-triangle-1-w{background-position:-96px -16px;}.ui-icon-triangle-1-nw{background-position:-112px -16px;}.ui-icon-triangle-2-n-s{background-position:-128px -16px;}.ui-icon-triangle-2-e-w{background-position:-144px -16px;}.ui-icon-arrow-1-n{background-position:0 -32px;}.ui-icon-arrow-1-ne{background-position:-16px -32px;}.ui-icon-arrow-1-e{background-position:-32px -32px;}.ui-icon-arrow-1-se{background-position:-48px -32px;}.ui-icon-arrow-1-s{background-position:-64px -32px;}.ui-icon-arrow-1-sw{background-position:-80px -32px;}.ui-icon-arrow-1-w{background-position:-96px -32px;}.ui-icon-arrow-1-nw{background-position:-112px -32px;}.ui-icon-arrow-2-n-s{background-position:-128px -32px;}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px;}.ui-icon-arrow-2-e-w{background-position:-160px -32px;}.ui-icon-arrow-2-se-nw{background-position:-176px -32px;}.ui-icon-arrowstop-1-n{background-position:-192px -32px;}.ui-icon-arrowstop-1-e{background-position:-208px -32px;}.ui-icon-arrowstop-1-s{background-position:-224px -32px;}.ui-icon-arrowstop-1-w{background-position:-240px -32px;}.ui-icon-arrowthick-1-n{background-position:0 -48px;}.ui-icon-arrowthick-1-ne{background-position:-16px -48px;}.ui-icon-arrowthick-1-e{background-position:-32px -48px;}.ui-icon-arrowthick-1-se{background-position:-48px -48px;}.ui-icon-arrowthick-1-s{background-position:-64px -48px;}.ui-icon-arrowthick-1-sw{background-position:-80px -48px;}.ui-icon-arrowthick-1-w{background-position:-96px -48px;}.ui-icon-arrowthick-1-nw{background-position:-112px -48px;}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px;}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px;}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px;}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px;}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px;}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px;}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px;}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px;}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px;}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px;}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px;}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px;}.ui-icon-arrowreturn-1-w{background-position:-64px -64px;}.ui-icon-arrowreturn-1-n{background-position:-80px -64px;}.ui-icon-arrowreturn-1-e{background-position:-96px -64px;}.ui-icon-arrowreturn-1-s{background-position:-112px -64px;}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px;}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px;}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px;}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px;}.ui-icon-arrow-4{background-position:0 -80px;}.ui-icon-arrow-4-diag{background-position:-16px -80px;}.ui-icon-extlink{background-position:-32px -80px;}.ui-icon-newwin{background-position:-48px -80px;}.ui-icon-refresh{background-position:-64px -80px;}.ui-icon-shuffle{background-position:-80px -80px;}.ui-icon-transfer-e-w{background-position:-96px -80px;}.ui-icon-transferthick-e-w{background-position:-112px -80px;}.ui-icon-folder-collapsed{background-position:0 -96px;}.ui-icon-folder-open{background-position:-16px -96px;}.ui-icon-document{background-position:-32px -96px;}.ui-icon-document-b{background-position:-48px -96px;}.ui-icon-note{background-position:-64px -96px;}.ui-icon-mail-closed{background-position:-80px -96px;}.ui-icon-mail-open{background-position:-96px -96px;}.ui-icon-suitcase{background-position:-112px -96px;}.ui-icon-comment{background-position:-128px -96px;}.ui-icon-person{background-position:-144px -96px;}.ui-icon-print{background-position:-160px -96px;}.ui-icon-trash{background-position:-176px -96px;}.ui-icon-locked{background-position:-192px -96px;}.ui-icon-unlocked{background-position:-208px -96px;}.ui-icon-bookmark{background-position:-224px -96px;}.ui-icon-tag{background-position:-240px -96px;}.ui-icon-home{background-position:0 -112px;}.ui-icon-flag{background-position:-16px -112px;}.ui-icon-calendar{background-position:-32px -112px;}.ui-icon-cart{background-position:-48px -112px;}.ui-icon-pencil{background-position:-64px -112px;}.ui-icon-clock{background-position:-80px -112px;}.ui-icon-disk{background-position:-96px -112px;}.ui-icon-calculator{background-position:-112px -112px;}.ui-icon-zoomin{background-position:-128px -112px;}.ui-icon-zoomout{background-position:-144px -112px;}.ui-icon-search{background-position:-160px -112px;}.ui-icon-wrench{background-position:-176px -112px;}.ui-icon-gear{background-position:-192px -112px;}.ui-icon-heart{background-position:-208px -112px;}.ui-icon-star{background-position:-224px -112px;}.ui-icon-link{background-position:-240px -112px;}.ui-icon-cancel{background-position:0 -128px;}.ui-icon-plus{background-position:-16px -128px;}.ui-icon-plusthick{background-position:-32px -128px;}.ui-icon-minus{background-position:-48px -128px;}.ui-icon-minusthick{background-position:-64px -128px;}.ui-icon-close{background-position:-80px -128px;}.ui-icon-closethick{background-position:-96px -128px;}.ui-icon-key{background-position:-112px -128px;}.ui-icon-lightbulb{background-position:-128px -128px;}.ui-icon-scissors{background-position:-144px -128px;}.ui-icon-clipboard{background-position:-160px -128px;}.ui-icon-copy{background-position:-176px -128px;}.ui-icon-contact{background-position:-192px -128px;}.ui-icon-image{background-position:-208px -128px;}.ui-icon-video{background-position:-224px -128px;}.ui-icon-script{background-position:-240px -128px;}.ui-icon-alert{background-position:0 -144px;}.ui-icon-info{background-position:-16px -144px;}.ui-icon-notice{background-position:-32px -144px;}.ui-icon-help{background-position:-48px -144px;}.ui-icon-check{background-position:-64px -144px;}.ui-icon-bullet{background-position:-80px -144px;}.ui-icon-radio-off{background-position:-96px -144px;}.ui-icon-radio-on{background-position:-112px -144px;}.ui-icon-pin-w{background-position:-128px -144px;}.ui-icon-pin-s{background-position:-144px -144px;}.ui-icon-play{background-position:0 -160px;}.ui-icon-pause{background-position:-16px -160px;}.ui-icon-seek-next{background-position:-32px -160px;}.ui-icon-seek-prev{background-position:-48px -160px;}.ui-icon-seek-end{background-position:-64px -160px;}.ui-icon-seek-start{background-position:-80px -160px;}/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */.ui-icon-seek-first{background-position:-80px -160px;}.ui-icon-stop{background-position:-96px -160px;}.ui-icon-eject{background-position:-112px -160px;}.ui-icon-volume-off{background-position:-128px -160px;}.ui-icon-volume-on{background-position:-144px -160px;}.ui-icon-power{background-position:0 -176px;}.ui-icon-signal-diag{background-position:-16px -176px;}.ui-icon-signal{background-position:-32px -176px;}.ui-icon-battery-0{background-position:-48px -176px;}.ui-icon-battery-1{background-position:-64px -176px;}.ui-icon-battery-2{background-position:-80px -176px;}.ui-icon-battery-3{background-position:-96px -176px;}.ui-icon-circle-plus{background-position:0 -192px;}.ui-icon-circle-minus{background-position:-16px -192px;}.ui-icon-circle-close{background-position:-32px -192px;}.ui-icon-circle-triangle-e{background-position:-48px -192px;}.ui-icon-circle-triangle-s{background-position:-64px -192px;}.ui-icon-circle-triangle-w{background-position:-80px -192px;}.ui-icon-circle-triangle-n{background-position:-96px -192px;}.ui-icon-circle-arrow-e{background-position:-112px -192px;}.ui-icon-circle-arrow-s{background-position:-128px -192px;}.ui-icon-circle-arrow-w{background-position:-144px -192px;}.ui-icon-circle-arrow-n{background-position:-160px -192px;}.ui-icon-circle-zoomin{background-position:-176px -192px;}.ui-icon-circle-zoomout{background-position:-192px -192px;}.ui-icon-circle-check{background-position:-208px -192px;}.ui-icon-circlesmall-plus{background-position:0 -208px;}.ui-icon-circlesmall-minus{background-position:-16px -208px;}.ui-icon-circlesmall-close{background-position:-32px -208px;}.ui-icon-squaresmall-plus{background-position:-48px -208px;}.ui-icon-squaresmall-minus{background-position:-64px -208px;}.ui-icon-squaresmall-close{background-position:-80px -208px;}.ui-icon-grip-dotted-vertical{background-position:0 -224px;}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px;}.ui-icon-grip-solid-vertical{background-position:-32px -224px;}.ui-icon-grip-solid-horizontal{background-position:-48px -224px;}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px;}.ui-icon-grip-diagonal-se{background-position:-80px -224px;}/* Misc visuals----------------------------------*//* Corner radius */.ui-corner-tl{-moz-border-radius-topleft:4px/*{cornerRadius}*/;-webkit-border-top-left-radius:4px/*{cornerRadius}*/;border-top-left-radius:4px/*{cornerRadius}*/;}.ui-corner-tr{-moz-border-radius-topright:4px/*{cornerRadius}*/;-webkit-border-top-right-radius:4px/*{cornerRadius}*/;border-top-right-radius:4px/*{cornerRadius}*/;}.ui-corner-bl{-moz-border-radius-bottomleft:4px/*{cornerRadius}*/;-webkit-border-bottom-left-radius:4px/*{cornerRadius}*/;border-bottom-left-radius:4px/*{cornerRadius}*/;}.ui-corner-br{-moz-border-radius-bottomright:4px/*{cornerRadius}*/;-webkit-border-bottom-right-radius:4px/*{cornerRadius}*/;border-bottom-right-radius:4px/*{cornerRadius}*/;}.ui-corner-top{-moz-border-radius-topleft:4px/*{cornerRadius}*/;-webkit-border-top-left-radius:4px/*{cornerRadius}*/;border-top-left-radius:4px/*{cornerRadius}*/;-moz-border-radius-topright:4px/*{cornerRadius}*/;-webkit-border-top-right-radius:4px/*{cornerRadius}*/;border-top-right-radius:4px/*{cornerRadius}*/;}.ui-corner-bottom{-moz-border-radius-bottomleft:4px/*{cornerRadius}*/;-webkit-border-bottom-left-radius:4px/*{cornerRadius}*/;border-bottom-left-radius:4px/*{cornerRadius}*/;-moz-border-radius-bottomright:4px/*{cornerRadius}*/;-webkit-border-bottom-right-radius:4px/*{cornerRadius}*/;border-bottom-right-radius:4px/*{cornerRadius}*/;}.ui-corner-right{-moz-border-radius-topright:4px/*{cornerRadius}*/;-webkit-border-top-right-radius:4px/*{cornerRadius}*/;border-top-right-radius:4px/*{cornerRadius}*/;-moz-border-radius-bottomright:4px/*{cornerRadius}*/;-webkit-border-bottom-right-radius:4px/*{cornerRadius}*/;border-bottom-right-radius:4px/*{cornerRadius}*/;}.ui-corner-left{-moz-border-radius-topleft:4px/*{cornerRadius}*/;-webkit-border-top-left-radius:4px/*{cornerRadius}*/;border-top-left-radius:4px/*{cornerRadius}*/;-moz-border-radius-bottomleft:4px/*{cornerRadius}*/;-webkit-border-bottom-left-radius:4px/*{cornerRadius}*/;border-bottom-left-radius:4px/*{cornerRadius}*/;}.ui-corner-all{-moz-border-radius:4px/*{cornerRadius}*/;-webkit-border-radius:4px/*{cornerRadius}*/;border-radius:4px/*{cornerRadius}*/;}/* Overlays */.ui-widget-overlay{background:#aaaaaa/*{bgColorOverlay}*/ url("#{resource['primefaces-casablanca:images/ui-bg_flat_0_aaaaaa_40x100.png']}")/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/;opacity:.3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/;}.ui-widget-shadow{margin:-8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/;padding:8px/*{thicknessShadow}*/;background:#aaaaaa/*{bgColorShadow}*/ url("#{resource['primefaces-casablanca:images/ui-bg_flat_0_aaaaaa_40x100.png']}") /*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/;opacity:.3;filter:Alpha(Opacity=30)/*{opacityShadow}*/;-moz-border-radius:8px/*{cornerRadiusShadow}*/;-webkit-border-radius:8px/*{cornerRadiusShadow}*/;border-radius:8px/*{cornerRadiusShadow}*/;}/* PrimeFaces Extensions */.ui-inputfield, .ui-widget-content .ui-inputfield, .ui-widget-header .ui-inputfield{background:#ffffff;-moz-box-shadow:inset 0 2px 2px #8f8f8f;-webkit-box-shadow:inset 0 2px 2px #8f8f8f;box-shadow:inset 0 2px 2px #8f8f8f;color:#000000;}.ui-inputfield.ui-state-focus, .ui-widget-content .ui-inputfield.ui-state-focus, .ui-widget-header .ui-inputfield.ui-state-focus{-moz-box-shadow:0px 0px 5px #b4a9a0, inset 0 2px 2px #8f8f8f;-webkit-box-shadow:0px 0px 5px #b4a9a0, inset 0 2px 2px #8f8f8f;box-shadow:0px 0px 5px #b4a9a0, inset 0 2px 2px #8f8f8f;}
\ No newline at end of file
code/moya-web/WebContent/resources/templates/primelayout/template.xhtml
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
</div> </div>
<div id="header_right"> <div id="header_right">
<a href="http://www.codecrew.fi"><img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" /> </a> <a href="http://www.codecrew.fi" target="_blank"><img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" style="padding: 10px 10px 5px 5px" /> </a>
</div> </div>
</div> </div>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!