You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2017/01/06 21:04:56 UTC
jspwiki git commit: JSPWIKI-1041: fix some lines in skin.css
Repository: jspwiki
Updated Branches:
refs/heads/master 24caeeb02 -> 544d58bd6
JSPWIKI-1041: fix some lines in skin.css
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/544d58bd
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/544d58bd
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/544d58bd
Branch: refs/heads/master
Commit: 544d58bd6ab68dbb8c75cf7c83fdfe4eb75b67f4
Parents: 24caeeb
Author: brushed <di...@gmail.com>
Authored: Fri Jan 6 22:04:44 2017 +0100
Committer: brushed <di...@gmail.com>
Committed: Fri Jan 6 22:04:44 2017 +0100
----------------------------------------------------------------------
ChangeLog | 5 ++
.../src/main/java/org/apache/wiki/Release.java | 2 +-
.../templates/default/skins/CleanBlue/skin.css | 24 +++----
.../default/skins/OrderedList/skin.css | 66 ++++++++++----------
4 files changed, 51 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/544d58bd/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 1b7a4fc..6e7fbee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-06 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.3-git-26
+ JSPWIKI-1041: fix some lines in skin.css
+
2017-01-03 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.3-git-25: few Haddock template fixes
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/544d58bd/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 77c03ad..60bbe09 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "25";
+ public static final String BUILD = "26";
/**
* This is the generic version string you should use when printing out the version. It is of
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/544d58bd/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.css
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.css b/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.css
index 041a5c7..801b890 100644
--- a/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.css
+++ b/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.css
@@ -95,7 +95,7 @@ b { font-weight : 600 ; }
/* header & footer ...................................... */
-#header,
+#header,
#footer {
color: #F1F4F7 ;
font-size : 95% ;
@@ -765,7 +765,7 @@ a.tool:hover,
#tbTAB { background-position: 0 -128px }
#tbSIGN { background-position: 0 -288px }
#doreplace {
- padding: 1px 0.6em 2px 0.6em;
+ padding: 1px 0.6em 2px 0.6em;
border-radius: 5px; -moz-border-radius: 5px ;
}
.editor {
@@ -957,8 +957,8 @@ td.changenote {
border-radius: 3px; -moz-border-radius: 3px;
}
#info th select { display: block }
-.pageactions {
- line-height: 1.5
+.pageactions {
+ line-height: 1.5
}
.pageactions ul {
list-style: none;
@@ -1130,7 +1130,7 @@ div#pagecontent p {
background: white;
border: 2px solid #D3E2FF;
padding: 0.25em 0.5em;
- white-space: nowrap
+ white-space: nowrap;
left: 0;
}
#searchboxMenu a {
@@ -1147,13 +1147,13 @@ div#pagecontent p {
background : #D7F2B3 ;
}
#searchboxMenu div { margin: .5em 0 }
-#searchboxMenu,
-#searchResult,
-#searchTarget,
-#searchOutput,
+#searchboxMenu,
+#searchResult,
+#searchTarget,
+#searchOutput,
#searchOutput ul li a,
-#searchOutput a,
-#recentSearches,
+#searchOutput a,
+#recentSearches,
#recentClear {
background:#F1F4F7; color: black ;
}
@@ -1950,7 +1950,7 @@ b { font-weight: 600 ; }
}
.graphcontent {
margin: 0.2em 20% 0em 1em ;
- padding: 0.7em 1.2em 0.5em 1.2em;
+ padding: 0.7em 1.2em 0.5em 1.2em;
max-width: 700px ;
background-color: #F1F4F7 ;
border: 3px solid rgba(189,209,225,0.5);
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/544d58bd/jspwiki-war/src/main/webapp/templates/default/skins/OrderedList/skin.css
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/webapp/templates/default/skins/OrderedList/skin.css b/jspwiki-war/src/main/webapp/templates/default/skins/OrderedList/skin.css
index c793fb2..0c69ec9 100755
--- a/jspwiki-war/src/main/webapp/templates/default/skins/OrderedList/skin.css
+++ b/jspwiki-war/src/main/webapp/templates/default/skins/OrderedList/skin.css
@@ -20,18 +20,18 @@
*/
/* ORDERED LIST skin
- * additional .css on top of jspwiki.css
+ * additional .css on top of jspwiki.css
* inspired by http://orderedlist.com
*/
-/* COLOR scheme
+/* COLOR scheme
#ccc normal font color
#c7ff70 green : font color headers, th
#ffff99 light yellow: font color pre
#6cf blue/green: font color links
-
+
#202326 hr, body background
-
+
#fc3 (orange) edit resizer, category, tip anchor
#ffff99 (light yellow) edit textarea, input fields
@@ -186,7 +186,7 @@ a.toc:hover {
}
.zebra-table th {
background:transparent;
-}
+}
.zebra-table tr.odd td {
background:#3f464a;
}
@@ -220,11 +220,11 @@ td.diff {
background-color:#3f464a;
}
.edit textarea, input[type=text] {
- xxbackground-color:#ffff99;
- xxcolor:#grey;
+ /*background-color:#ffff99;*/
+ /*color:#grey;*/
}
#toctoc label {
- color:#c7ff70;
+ color:#c7ff70;
}
#toctoc ul {
border-color:#fc3;
@@ -264,7 +264,7 @@ td.diff {
.searchword, .cursor, .searchmatch {
background-color:#c7ff70;
color:black !important;
-}
+}
/* +++ 455 Footer +++ */
.copyright {
color:white;
@@ -299,8 +299,8 @@ td.diff {
background:#3f464a;
border:2px solid #3f464a;
}
-.pageactions li ul li.separator {
- border-top:2px solid #c7ff70;
+.pageactions li ul li.separator {
+ border-top:2px solid #c7ff70;
}
.pageactions a.action {
border-bottom:none;
@@ -316,7 +316,7 @@ td.diff {
border:none;
}
a.action.more, a.action.sectiontoc {
- background:#3f464a url(images/arrdown.gif) 95% center no-repeat;*/
+ background:#3f464a url(images/arrdown.gif) 95% center no-repeat;
}
a.tool {
@@ -333,7 +333,7 @@ a.tool:hover {
border:4px solid #fc3;
}
#tools h4 {
- color:#black;
+ color:black;
font-weight:bold;
border-color:#ffff99;
}
@@ -344,14 +344,14 @@ a.tool:hover {
#toolbuttons span {
border:1px solid #fc3;
}
-#toolbar a.tool {
- border:none;
+#toolbar a.tool {
+ border:none;
background-repeat:no-repeat;
background-color:transparent;
background-position:3px 3px;
- height:16px;
- width:16px;
- text-indent:20px;
+ height:16px;
+ width:16px;
+ text-indent:20px;
overflow:hidden;
}
@@ -360,14 +360,14 @@ a.tool:hover {
background-color:#ff9;
border:4px solid #fc3;
}
-#findSuggestionMenu .hover {
+#findSuggestionMenu .hover {
background-color:#fc3;
}
/* +++ 475 PageContent.jsp +++ */
#sneakpreviewheader {
background-color:#3f464a;
-}
+}
#sneakpreview {
background:transparent !important;
}
@@ -387,7 +387,7 @@ a.tool:hover {
border-bottom:none;
}
/* +++ 485 SearchBox +++ */
-.spin {
+.spin {
background:url(images/spin.gif) no-repeat;
}
#header a:link, #header a:visited, #recentSearches div {
@@ -400,7 +400,7 @@ a.tool:hover {
border:none ;
background:#3f464a;
}
-#searchTools a:hover, #searchboxMenu li:hover, #searchboxMenu a:hover {
+#searchTools a:hover, #searchboxMenu li:hover, #searchboxMenu a:hover {
background:#c7ff70;
color:black !important;
}
@@ -442,7 +442,7 @@ body {
.weblogcomments {
background:#202326;
}
-
+
/* +++ 640 RecentChangesPlugin +++ */
.recentchanges td {
border-bottom:1px solid #202326;
@@ -498,7 +498,7 @@ table.calendar * {
border:1px solid #3f464a;
background:#3f464a;
}
-.accordion .toggle {
+.accordion .toggle {
border:2px solid #3f464a;
background:#303538;
color:#c7ff70;
@@ -506,13 +506,13 @@ table.calendar * {
.accordion .toggle:hover, .togglemenu .toggle:hover, .sidemenu .toggle:hover {
background:#202326;
}
-.togglemenu .toggle {
+.togglemenu .toggle {
background:#303538;
border:none;
border-bottom:1px solid #3f464a;
margin:0 0 -1px 4px;
}
-.togglemenu .toggle.active {
+.togglemenu .toggle.active {
background:#3f464a;
border-bottom:1px solid #3f464a;
color:white;
@@ -527,7 +527,7 @@ table.calendar * {
}
.sidemenu .toggle.active {
color:#c7ff70;
-}
+}
/* +++ 915 Tips +++ */
.tip-anchor {
@@ -580,7 +580,7 @@ table.calendar * {
}
.collapsetitle {
border:2px solid #3f464a;
-}
+}
.collapsetitle:hover {
background:#303538;
}
@@ -614,7 +614,7 @@ a.slimbox:hover {
#lbOverlay {
background-color:#fff;
}
-#lbCenter,
+#lbCenter,
#lbBottomContainer {
background-color:#202326;
}
@@ -625,7 +625,7 @@ a.slimbox:hover {
.categoryLink:link, .categoryLink:active, .categoryLink:visited {
border-bottom:2px solid #fc3;
color:#fc3;
-}
+}
.categoryPopup {
background-color:#ff9; /*rgba(255,255,153,0.7); */
border:4px solid #fc3;
@@ -634,11 +634,11 @@ a.slimbox:hover {
color:#c30;
border-bottom:1px solid #c30;
}
-.categoryPopup .hover {
+.categoryPopup .hover {
background-color:#fc3;
}
-pre.prettyprint {
+pre.prettyprint {
background-color:#ff9;
border:4px solid #fc3;
}
@@ -652,4 +652,4 @@ pre.prettyprint {
color:#c7ff70;
font-weight:bold;
border-bottom:2px solid #c7ff70;
-}
+}