Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change padding to margin #2749

Merged
merged 1 commit into from
Nov 26, 2024
Merged

change padding to margin #2749

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions bundles/framework/announcements/resources/scss/announcementsplugin.ol.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ div.announcements-content {
}

div.mapplugin.announcements {
padding: 10px 10px 0 10px;
margin: 10px 10px 0 10px;
clear:both;
height: 37px;
overflow: visible;
Expand All @@ -38,48 +38,48 @@ div.mapplugin.announcements {
div.content {
background-color: white;
max-height: 95%;

div.announcements-content {
overflow: hidden;
width:100%;
background-color: #fff;

}

&.mobile {
position:fixed;
top:36px;
left:0;
width:100%;
}

div.content-header {
/* This is some sort of a theme color... leave it be */
background-color: #333438;
color: #FFFFFF;
text-align: left;
height: 25px;
padding: 5px;

.content-close {
display: inline-block;
float: right;
cursor: pointer;
}

div.content-header-title {
display: inline-block;
float: left;
padding: 5px;
}
}

div.baseLayerHeader, div.layerHeader {
background-color: #E6E6E6;
padding: 10px;
text-align: left;
}

div.layer {
margin: 5px 0;
text-align: left;
Expand All @@ -88,20 +88,20 @@ div.mapplugin.announcements {
margin-right: 10px;
float: left;
}

span {
display: block;
margin-left: 30px;
word-break: break-word;
}

.style-selector select{
max-width: 120px;
display: inline-block;
margin-left: 5px;
margin-left: 5px;
}
}

div.styled-header-arrow {
width: 0px;
height: 0px;
Expand All @@ -113,11 +113,11 @@ div.mapplugin.announcements {
border-bottom: 10px solid #333438;
}
}

div.layers, div.baselayers {
padding: 10px;
}

div.announcements-header {
background-color: #3c3c3c;
color: #FFF;
Expand All @@ -129,7 +129,7 @@ div.mapplugin.announcements {
margin-right: 4px;
vertical-align: middle;
}

&.mobile {
position:fixed;
top:0;
Expand All @@ -152,11 +152,11 @@ div.mapplugin.announcements {
font-weight: lighter !important;
text-shadow: 0px 0px #fff !important;
}

.active, .collapsible:hover {
background-color: #555 !important;
}

.announcement-content {
text-align: left;
max-height: 0;
Expand All @@ -170,11 +170,11 @@ div.mapplugin.announcements {
padding-bottom: 0px !important;
}
}

div.announcements-header:hover {
color: #ff9100;
}

.oskari-publisher-layers-rounded-dark, .oskari-publisher-layers-rounded-light {
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
Expand All @@ -185,15 +185,15 @@ div.mapplugin.announcements {
-moz-background-clip: padding-box;
background-clip: padding-box;
}

.oskari-publisher-layers-sharp-dark, .oskari-publisher-layers-sharp-light {
-webkit-border-radius: 0;
-moz-border-radius: 0;
-o-border-radius: 0;
-ms-border-radius: 0;
border-radius: 0;
}

.oskari-publisher-layers-3d-dark, .oskari-publisher-layers-3d-light {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
Expand All @@ -204,7 +204,7 @@ div.mapplugin.announcements {
-moz-background-clip: padding-box;
background-clip: padding-box;
}

.oskari-publisher-layers-header-rounded-dark, .oskari-publisher-layers-header-rounded-light {
-webkit-border-radius: 13px 13px 0 0;
-moz-border-radius: 13px 13px 0 0;
Expand All @@ -215,15 +215,15 @@ div.mapplugin.announcements {
-moz-background-clip: padding-box;
background-clip: padding-box;
}

.oskari-publisher-layers-header-sharp-dark, .oskari-publisher-layers-header-sharp-light {
-webkit-border-radius: 0;
-moz-border-radius: 0;
-o-border-radius: 0;
-ms-border-radius: 0;
border-radius: 0;
}

.oskari-publisher-layers-header-3d-dark, .oskari-publisher-layers-header-3d-light {
-webkit-border-radius: 1px 1px 0 0;
-moz-border-radius: 1px 1px 0 0;
Expand All @@ -235,19 +235,19 @@ div.mapplugin.announcements {
background-clip: padding-box;
}
}

.published-styled-layerselector {
position: relative !important;
}

.published-styled-layerselector-header {
width: 38px !important;
height: 38px !important;
padding: 0px !important;
background-color: transparent !important;
float: right !important;
}

.published-styled-layerselector-content {
position: absolute;
top: 44px !important;
Expand All @@ -256,7 +256,7 @@ div.mapplugin.announcements {
top: 0 !important;
}
}

/* Hacketyhack, we need to keep the popup on screen */
.mapplugins.left div.mapplugin.announcements div.published-styled-layerselector-content {
left: 0px !important;
Expand All @@ -265,25 +265,25 @@ div.mapplugin.announcements {
top: 0 !important;
}
}

.mapplugins.left div.mapplugin.announcements div.published-styled-layerselector-content div.styled-header-arrow {
margin-left: 12px !important;
}

div.mapplugin {
&.announcementspopup {
div.content {
div.baseLayerHeader, div.layerHeader {
font-weight: bold;
padding-bottom: 6px;
}

.style-selector select{
max-width: 120px;
display: inline-block;
margin-left: 5px;
margin-left: 5px;
}

div.layerHeader {
padding-top: 10px;
}
Expand Down