Skip to content
Snippets Groups Projects
Commit 5813c4c2 authored by srosse's avatar srosse
Browse files

OO-1068: reduce size of map css

parent 4aea8c5b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 112 additions and 113 deletions
src/main/java/org/olat/portfolio/EPUserToolExtension.java 0 → 100644
+ 38
− 0
View file @ 5813c4c2
/**
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); <br>
* you may not use this file except in compliance with the License.<br>
* You may obtain a copy of the License at the
* <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
* <p>
* Unless required by applicable law or agreed to in writing,<br>
* software distributed under the License is distributed on an "AS IS" BASIS, <br>
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
* See the License for the specific language governing permissions and <br>
* limitations under the License.
* <p>
* Initial code contributed and copyrighted by<br>
* frentix GmbH, http://www.frentix.com
* <p>
*/
package org.olat.portfolio;
import org.olat.core.CoreSpringFactory;
import org.olat.core.extensions.action.GenericActionExtension;
/**
*
* Initial date: 02.07.2014<br>
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
public class EPUserToolExtension extends GenericActionExtension {
@Override
public boolean isEnabled() {
PortfolioModule module = CoreSpringFactory.getImpl(PortfolioModule.class);
return module.isEnabled() && super.isEnabled();
}
}
\ No newline at end of file
src/main/java/org/olat/portfolio/_spring/portfolioContext.xml
+ 1
− 1
View file @ 5813c4c2
......@@ -175,7 +175,7 @@
</bean>
<!-- hook to the personal menu -->
<bean class="org.olat.core.extensions.action.GenericActionExtension" name="personal.tool.ep" init-method="initExtensionPoints" >
<bean class="org.olat.portfolio.EPUserToolExtension" name="personal.tool.ep" init-method="initExtensionPoints" >
<property name="order" value="301" />
<property name="navigationKey" value="Portfolio" />
<property name="enabled" value="${minimalhome.ext.portfolio}"></property>
......
src/main/java/org/olat/portfolio/ui/_content/mymapsmain.html
+ 2
− 2
View file @ 5813c4c2
......@@ -6,12 +6,12 @@
<div class="o_toolbar" role="toolbar">
<div class="container-fluid">
#if($r.available("search_input"))
<ul class="o_tools o_tools_left">
<ul class="o_tools o_tools_left list-unstyled">
<li><div class="b_eportfolio_fulltextsearch btn-group">$r.render("search_input")</div></li>
</ul>
#end
#if($r.available("create.map"))
<ul class="o_tools o_tools_right">
<ul class="o_tools o_tools_right list-unstyled">
<li><div class="b_ep_add_artefact btn-group pull-right">$r.render("create.map")</div></li>
</ul>
#end
......
src/main/java/org/olat/portfolio/ui/_content/segments.html
+ 5
− 6
View file @ 5813c4c2
<div class="clearfix">
$r.render("segments") <br/>
#if($r.available("segmentCmp"))
$r.render("segmentCmp")
#end
$r.render("segments")
<div class="o_segments_content">
#if($r.available("segmentCmp"))
$r.render("segmentCmp")
#end
</div>
\ No newline at end of file
src/main/java/org/olat/portfolio/ui/structel/_content/mapview.html
+ 2
− 2
View file @ 5813c4c2
......@@ -2,12 +2,12 @@
<div class="o_toolbar" role="toolbar">
<div class="container-fluid">
#if($r.available("backLink"))
<ul class="o_tools o_tools_left">
<ul class="o_tools o_tools_left list-unstyled">
<li><div class="btn-group">$r.render("backLink")</div></li>
</ul>
#end
#if($r.available("map.editButton"))
<ul class="o_tools o_tools_right">
<ul class="o_tools o_tools_right list-unstyled">
<li>$r.render("map.editButton")</li>
</ul>
#end
......
src/main/webapp/static/themes/light/modules/_portfolio.scss
+ 1
− 0
View file @ 5813c4c2
......@@ -22,6 +22,7 @@
.o_eportfolio_maps {
.panel {
font-family: 'Century Gothic', 'Apple Gothic', sans-serif;
box-shadow: 3px 3px 4px rgba(20,20,20,0.4);
}
.panel-heading {
padding: 5px 10px;
......
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_blue.scss
+ 4
− 6
View file @ 5813c4c2
......@@ -5,9 +5,11 @@ $infotextcolor : #000;
$bordercolor : #888;
$titlecolor : #444;
.o_eportfolio_maps .o_map-epmst-blue {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-epmst-blue {
@include epmst-map($bg_gradient1, $bg_gradient2, $bordercolor);
}
.o_eportfolio_maps .o_map-epmst-blue {
h4 {
color: $titlecolor;
}
......@@ -15,7 +17,3 @@ $titlecolor : #444;
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-blue {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_blue2.scss
+ 6
− 8
View file @ 5813c4c2
$bg_gradient1 : #C4F6FF;
$bg_gradient2 : #C4F6FF;
$infotextcolor : #000;
$bordercolor : #888;
$titlecolor : #444;
.o_eportfolio_maps .o_map-epmst-blue2 {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-epmst-blue2 {
background-color: $bg_gradient1;
border: 1px solid $bordercolor;
border-left: 3px solid transparentize(darken($bordercolor, 20%),0.2);
}
.o_eportfolio_maps .o_map-epmst-blue2 {
h4 {
color: $titlecolor;
}
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-blue2 {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_blue3.scss
+ 7
− 5
View file @ 5813c4c2
......@@ -5,8 +5,14 @@ $infotextcolor : #000;
$bordercolor : #888;
$titlecolor : #444;
.o_map-epmst-blue3 {
background-color: $bg_gradient1;
border: 1px solid $bordercolor;
border-left: 3px solid transparentize(darken($bordercolor, 20%),0.2);
}
.o_eportfolio_maps .o_map-epmst-blue3 {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
box-shadow: 3px 3px 4px rgba(20,20,20,0.4);
h4 {
color: $titlecolor;
......@@ -14,8 +20,4 @@ $titlecolor : #444;
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-blue3 {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_blue4.scss
+ 4
− 6
View file @ 5813c4c2
......@@ -5,17 +5,15 @@ $infotextcolor : #000;
$bordercolor : #888;
$titlecolor : #444;
.o_eportfolio_maps .o_map-epmst-blue4 {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-epmst-blue4 {
@include epmst-map($bg_gradient1, $bg_gradient2, $bordercolor);
}
.o_eportfolio_maps .o_map-epmst-blue4 {
h4 {
color: $titlecolor;
}
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-blue4 {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_comic.scss
+ 1
− 10
View file @ 5813c4c2
$bordercolor : #888;
.o_eportfolio_maps .o_map-comic {
.o_map-comic {
background: #a2c3e8 none;
font-family: 'Comic Sans MS', 'Comic Sans', fantasy;
border: 1px solid $bordercolor;
border-left: 3px solid transparentize(darken($bordercolor, 20%),0.2);
box-shadow: 3px 3px 4px rgba(20,20,20,0.4);
}
.o_eportfolio_map.o_map-comic {
background: #a2c3e8;
font-family: 'Comic Sans MS', 'Comic Sans', fantasy;
border: 1px solid $bordercolor;
border-left: 3px solid transparentize(darken($bordercolor, 20%),0.2);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_default.scss
+ 4
− 5
View file @ 5813c4c2
......@@ -5,9 +5,11 @@ $infotextcolor : #000;
$bordercolor : #efefef;
$titlecolor : #444;
.o_eportfolio_maps .o_map-default {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-default {
@include epmst-map($bg_gradient1, $bg_gradient2, $bordercolor);
}
.o_eportfolio_maps .o_map-default {
h4 {
color: $titlecolor;
background: none;
......@@ -15,7 +17,4 @@ $titlecolor : #444;
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-default {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_green.scss
+ 6
− 8
View file @ 5813c4c2
$bg_gradient1 : #ECF69A;
$bg_gradient2 : #ECF69A;
$infotextcolor : #000;
$bordercolor : #888;
$titlecolor : #444;
.o_eportfolio_maps .o_map-epmst-green {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-epmst-green {
background-color: $bg_gradient1;
border: 1px solid $bordercolor;
border-left: 3px solid transparentize(darken($bordercolor, 20%),0.2);
}
.o_eportfolio_maps .o_map-epmst-green {
h4 {
color: $titlecolor;
}
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-green {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_green2.scss
+ 4
− 6
View file @ 5813c4c2
......@@ -5,17 +5,15 @@ $infotextcolor : #000;
$bordercolor : #bbb;
$titlecolor : #555;
.o_eportfolio_maps .o_map-epmst-green2 {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-epmst-green2 {
@include epmst-map($bg_gradient1, $bg_gradient2, $bordercolor);
}
.o_eportfolio_maps .o_map-epmst-green2 {
h4 {
color: $titlecolor;
}
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-green2 {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_green3.scss
+ 4
− 6
View file @ 5813c4c2
......@@ -5,17 +5,15 @@ $infotextcolor : #000;
$bordercolor : #bbb;
$titlecolor : #555;
.o_eportfolio_maps .o_map-epmst-green3 {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-epmst-green3 {
@include epmst-map($bg_gradient1, $bg_gradient2, $bordercolor);
}
.o_eportfolio_maps .o_map-epmst-green3 {
h4 {
color: $titlecolor;
}
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-green3 {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_green4.scss
+ 6
− 8
View file @ 5813c4c2
$bg_gradient1 : #D7DBB5;
$bg_gradient2 : #D7DBB5;
$infotextcolor : #000;
$bordercolor : #bbb;
$titlecolor : #555;
.o_eportfolio_maps .o_map-epmst-green4 {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-epmst-green4 {
background-color: $bg_gradient1;
border: 1px solid $bordercolor;
border-left: 3px solid transparentize(darken($bordercolor, 20%),0.2);
}
.o_eportfolio_maps .o_map-epmst-green4 {
h4 {
color: $titlecolor;
}
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-green4 {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_leather.scss
+ 4
− 16
View file @ 5813c4c2
$bordercolor : #888;
.o_eportfolio_maps .o_map-leather {
.o_map-leather {
background-color: rgb(149, 115, 82);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(248,248,248, 0.7)), color-stop(100%, rgba(193,193,193, 0.5))), url('#{$o-images-path}portfolio/white-leather-tile.jpg'),;
background-image: -webkit-linear-gradient(top, rgba(248,248,248, 0.7), rgba(193,193,193, 0.5)), url('#{$o-images-path}portfolio/white-leather-tile.jpg');
......@@ -13,8 +13,9 @@ $bordercolor : #888;
border: 1px solid $bordercolor;
border-left: 3px solid transparentize(darken($bordercolor, 20%),0.2);
box-shadow: 3px 3px 4px rgba(20,20,20,0.4);
}
.o_eportfolio_maps .o_map-leather {
h4 {
background: rgba(243, 230, 225, 0.3) none;
}
......@@ -29,19 +30,6 @@ $bordercolor : #888;
}
.o_eportfolio_map.o_map-leather {
background-color: rgb(149, 115, 82);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(248,248,248, 0.7)), color-stop(100%, rgba(193,193,193, 0.5))), url('#{$o-images-path}portfolio/white-leather-tile.jpg'),;
background-image: -webkit-linear-gradient(top, rgba(248,248,248, 0.7), rgba(193,193,193, 0.5)), url('#{$o-images-path}portfolio/white-leather-tile.jpg');
background-image: -moz-linear-gradient(top, rgba(248,248,248, 0.7), rgba(193,193,193, 0.5)), url('#{$o-images-path}portfolio/white-leather-tile.jpg');
background-image: -ms-linear-gradient(top, rgba(248,248,248, 0.7), rgba(193,193,193, 0.5)), url('#{$o-images-path}portfolio/white-leather-tile.jpg');
background-image: -o-linear-gradient(top, rgba(248,248,248, 0.7), rgba(193,193,193, 0.5)), url('#{$o-images-path}portfolio/white-leather-tile.jpg');
background-image: linear-gradient(top, rgba(248,248,248, 0.7), rgba(193,193,193, 0.5)), url('#{$o-images-path}portfolio/white-leather-tile.jpg');
font-family: Palatino, Georgia, serif;
border: 1px solid $bordercolor;
border-left: 3px solid transparentize(darken($bordercolor, 30%),0.2);
.o_map_header {
h4, p, a, span, label {
color: #333;
......
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_red.scss
+ 4
− 6
View file @ 5813c4c2
......@@ -5,17 +5,15 @@ $infotextcolor : #000;
$bordercolor : #888;
$titlecolor : #444;
.o_eportfolio_maps .o_map-epmst-red {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-epmst-red {
@include epmst-map($bg_gradient1, $bg_gradient2, $bordercolor);
}
.o_eportfolio_maps .o_map-epmst-red {
h4 {
color: $titlecolor;
}
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-red {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_red2.scss
+ 5
− 6
View file @ 5813c4c2
......@@ -5,17 +5,16 @@ $infotextcolor : #000;
$bordercolor : #888;
$titlecolor : #444;
.o_eportfolio_maps .o_map-epmst-red2 {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
.o_map-epmst-red2 {
@include epmst-map($bg_gradient1, $bg_gradient2, $bordercolor);
}
.o_eportfolio_maps .o_map-epmst-red2 {
h4 {
color: $titlecolor;
}
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-red2 {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
src/main/webapp/static/themes/light/modules/_portfoliomaps/_epmst_red3.scss
+ 4
− 6
View file @ 5813c4c2
......@@ -5,17 +5,15 @@ $infotextcolor : #000;
$bordercolor : #888;
$titlecolor : #444;
.o_map-epmst-red3 {
@include epmst-map($bg_gradient1, $bg_gradient2, $bordercolor);
}
.o_eportfolio_maps .o_map-epmst-red3 {
@include epmst-mapclosed($bg_gradient1, $bg_gradient2, $bordercolor);
h4 {
color: $titlecolor;
}
.panel-body, td, a {
color: $infotextcolor;
}
}
.o_eportfolio_map.o_map-epmst-red3 {
@include epmst-actualpage($bg_gradient1, $bg_gradient2, $bordercolor);
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment