ni_nitdoc: uniformized graphic style

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/share/ni_nitdoc/resources/icons/close.png b/share/ni_nitdoc/resources/icons/close.png
deleted file mode 100755 (executable)
index c11f7af..0000000
Binary files a/share/ni_nitdoc/resources/icons/close.png and /dev/null differ

diff --git a/share/ni_nitdoc/resources/icons/const_private.png b/share/ni_nitdoc/resources/icons/const_private.png
index 9d0605b..53def84 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/const_private.png and b/share/ni_nitdoc/resources/icons/const_private.png differ

diff --git a/share/ni_nitdoc/resources/icons/const_protected.png b/share/ni_nitdoc/resources/icons/const_protected.png
index f931ced..99530e3 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/const_protected.png and b/share/ni_nitdoc/resources/icons/const_protected.png differ

diff --git a/share/ni_nitdoc/resources/icons/const_public.png b/share/ni_nitdoc/resources/icons/const_public.png
index 3977f93..393f130 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/const_public.png and b/share/ni_nitdoc/resources/icons/const_public.png differ

diff --git a/share/ni_nitdoc/resources/icons/github-icon-green.png b/share/ni_nitdoc/resources/icons/github-icon-green.png
index bd70ccc..d291056 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/github-icon-green.png and b/share/ni_nitdoc/resources/icons/github-icon-green.png differ

diff --git a/share/ni_nitdoc/resources/icons/meth_private.png b/share/ni_nitdoc/resources/icons/meth_private.png
index d80a19d..0217515 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/meth_private.png and b/share/ni_nitdoc/resources/icons/meth_private.png differ

diff --git a/share/ni_nitdoc/resources/icons/meth_protected.png b/share/ni_nitdoc/resources/icons/meth_protected.png
index 1777da9..eb20e7c 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/meth_protected.png and b/share/ni_nitdoc/resources/icons/meth_protected.png differ

diff --git a/share/ni_nitdoc/resources/icons/meth_public.png b/share/ni_nitdoc/resources/icons/meth_public.png
index a08a470..e5906ee 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/meth_public.png and b/share/ni_nitdoc/resources/icons/meth_public.png differ

diff --git a/share/ni_nitdoc/resources/icons/vtype_private.png b/share/ni_nitdoc/resources/icons/vtype_private.png
index 141f8ce..b526812 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/vtype_private.png and b/share/ni_nitdoc/resources/icons/vtype_private.png differ

diff --git a/share/ni_nitdoc/resources/icons/vtype_protected.png b/share/ni_nitdoc/resources/icons/vtype_protected.png
index 0e11eab..f3515e7 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/vtype_protected.png and b/share/ni_nitdoc/resources/icons/vtype_protected.png differ

diff --git a/share/ni_nitdoc/resources/icons/vtype_public.png b/share/ni_nitdoc/resources/icons/vtype_public.png
index caaa932..a70354d 100644 (file)
Binary files a/share/ni_nitdoc/resources/icons/vtype_public.png and b/share/ni_nitdoc/resources/icons/vtype_public.png differ

diff --git a/share/ni_nitdoc/resources/top_back.gif b/share/ni_nitdoc/resources/top_back.gif
deleted file mode 100644 (file)
index 82e1e83..0000000
Binary files a/share/ni_nitdoc/resources/top_back.gif and /dev/null differ

diff --git a/share/ni_nitdoc/scripts/Nitdoc.GitHub.js b/share/ni_nitdoc/scripts/Nitdoc.GitHub.js
index 094af99..542011b 100644 (file)
--- a/share/ni_nitdoc/scripts/Nitdoc.GitHub.js
+++ b/share/ni_nitdoc/scripts/Nitdoc.GitHub.js
@@ -789,6 +789,7 @@ Nitdoc.GitHub.LoginBox = function() {
                .append(\r
                        $(document.createElement("button"))\r
                        .addClass("nitdoc-github-button")\r
+                       .addClass("nitdoc-github-cancel")\r
                        .append(\r
                                $(document.createElement("img"))\r
                                .attr("src", "resources/icons/github-icon.png")\r
@@ -1020,16 +1021,9 @@ Nitdoc.GitHub.ModalBox = function() {
                        .append(\r
                                $(document.createElement("a"))\r
                                .addClass("nitdoc-github-close")\r
-                               .append(\r
-                                       $(document.createElement("img"))\r
-                                       .addClass("nitdoc-github-imgClose")\r
-                                       .attr({\r
-                                               src: "resources/icons/close.png",\r
-                                               title: "Close",\r
-                                               alt: "Close"\r
-                               \r
-                                       })\r
-                               ).click(function() { Nitdoc.GitHub.ModalBox.close() })\r
+                               .attr("title", "Close")\r
+                               .append("x")\r
+                               .click(function() { Nitdoc.GitHub.ModalBox.close() })\r
                        )\r
                        .append("<h3>" + title + "</h3>")\r
                        .append("<div>" + content + "</div>")\r
@@ -1093,16 +1087,9 @@ Nitdoc.GitHub.CommitBox = function() {
                        .append(\r
                                $(document.createElement("a"))\r
                                .addClass("nitdoc-github-close")\r
-                               .append(\r
-                                       $(document.createElement("img"))\r
-                                       .addClass("nitdoc-github-imgClose")\r
-                                       .attr({\r
-                                               src: "resources/icons/close.png",\r
-                                               title: "Close",\r
-                                               alt: "Close"\r
-                               \r
-                                       })\r
-                               ).click(function() { Nitdoc.GitHub.CommitBox.close() })\r
+                               .attr("title", "Close")\r
+                               .append("x")\r
+                               .click(function() { Nitdoc.GitHub.CommitBox.close() })\r
                        )\r
                        .append("<h3>Commit changes</h3>")\r
                        .append(\r

diff --git a/share/ni_nitdoc/styles/Nitdoc.GitHub.css b/share/ni_nitdoc/styles/Nitdoc.GitHub.css
index 7351332..3c7179b 100644 (file)
--- a/share/ni_nitdoc/styles/Nitdoc.GitHub.css
+++ b/share/ni_nitdoc/styles/Nitdoc.GitHub.css
@@ -39,8 +39,8 @@
        cursor: default;\r
        position: absolute;\r
        width : 220px;\r
-       margin-top: 10px;\r
-       margin-left: -215px;\r
+       margin-top: 2px;\r
+       margin-left: -208px;\r
        display: block;\r
        padding: 10px;\r
        text-align: left;\r
@@ -48,12 +48,12 @@
        background-color: #ffffff;\r
        border: 1px solid #ccc;\r
        border: 1px solid rgba(0, 0, 0, 0.2);\r
-       -webkit-border-radius: 6px;\r
-       -moz-border-radius: 6px;\r
-       border-radius: 6px;\r
-       -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);\r
-       -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);\r
-       box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);\r
+       -webkit-border-radius: 2px;\r
+       -moz-border-radius: 2px;\r
+       border-radius: 2px;\r
+       -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);\r
+       -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);\r
+       box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);\r
        -webkit-background-clip: padding-box;\r
        -moz-background-clip: padding;\r
        background-clip: padding-box;\r
@@ -66,10 +66,10 @@
        height: 0;\r
        border-color: transparent;\r
        border-style: solid;\r
-       border-width: 11px;\r
-       top: -11px;\r
+       border-width: 7px;\r
+       top: -7px;\r
        left: 50%;\r
-       margin-left: 93px;\r
+       margin-left: 90px;\r
        border-bottom-color: #999;\r
        border-bottom-color: rgba(0, 0, 0, 0.25);\r
        border-top-width: 0;\r
@@ -108,12 +108,13 @@
 #nitdoc-github-loginbox button {\r
        margin-top: 15px;\r
        width: 220px;\r
+       font-weight: bold;\r
 }\r
 \r
 #nitdoc-github-loginbox h4 {\r
        display: block;\r
        width: 100%;\r
-       color: black;\r
+       color: #6C6C6C;\r
        font-style: normal;\r
        text-align: center;\r
        margin-bottom: 20px;\r
@@ -134,9 +135,9 @@ button.nitdoc-github-button {
        background-image:      -o-linear-gradient(top, #92C929, #1d7900); /* Opera 11.10+ */\r
        background-image:         linear-gradient(top, #92C929, #1d7900);\r
        filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#92C929', EndColorStr='#1d7900'); /* IE6–IE9 */\r
-       border-radius: 4px;\r
-       -moz-border-radius: 4px;\r
-       -webkit-border-radius: 4px;\r
+       border-radius: 2px;\r
+       -moz-border-radius: 2px;\r
+       -webkit-border-radius: 2px;\r
        -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;\r
        box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
        -moz-box-shadow: 0px 2px 4px rgba(0,0,0, .2);\r
@@ -146,7 +147,6 @@ button.nitdoc-github-button {
        -webkit-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
        border: 1px solid #1d7900;\r
        color: #fff;\r
-       font-weight: bold;\r
        font-size: 14px;\r
        padding: 5px 7px 5px 7px;\r
        text-align: center;\r
@@ -187,7 +187,7 @@ button.nitdoc-github-button img {
 .nitdoc-github-modal {\r
        background: #fff;\r
        padding: 20px;\r
-       border: 3px solid #ddd;\r
+       border: 1px solid #ddd;\r
        float: left;\r
        position: fixed;\r
        z-index: 99999;\r
@@ -196,9 +196,9 @@ button.nitdoc-github-button img {
        -moz-box-shadow: 0px 0px 20px #000;\r
        box-shadow: 0px 0px 20px #000;\r
        /* round corners CSS3 */\r
-       -webkit-border-radius: 10px;\r
-       -moz-border-radius: 10px;\r
-       border-radius: 10px;\r
+       -webkit-border-radius: 2px;\r
+       -moz-border-radius: 2px;\r
+       border-radius: 2px;\r
        text-align: left;\r
 }\r
 \r
@@ -224,8 +224,11 @@ button.nitdoc-github-button img {
 \r
 .nitdoc-github-close {\r
        float: right;\r
-       margin: -35px -35px 0 0;\r
+       margin: -22px -17px 0 0;\r
        cursor: pointer;\r
+       font-size: 1.3em;\r
+       font-weight: bold;\r
+       text-transform: lowercase;\r
 }\r
 \r
 /* Comment editing */\r
@@ -252,13 +255,13 @@ button.nitdoc-github-button img {
 \r
 .nitdoc-github-button.nitdoc-github-cancel {\r
        background-color: #b33630;\r
-       background-image: -webkit-gradient(linear, left top, left bottom, from(#b33630), to(#9f312c)); /* Saf4+, Chrome */\r
-       background-image: -webkit-linear-gradient(top, #b33630, #9f312c); /* Chrome 10+, Saf5.1+ */\r
-       background-image:    -moz-linear-gradient(top, #b33630, #9f312c); /* FF3.6 */\r
-       background-image:     -ms-linear-gradient(top, #b33630, #9f312c); /* IE10 */\r
-       background-image:      -o-linear-gradient(top, #b33630, #9f312c); /* Opera 11.10+ */\r
-       background-image:         linear-gradient(top, #b33630, #9f312c);\r
-       filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#b33630', EndColorStr='##9f312c'); /* IE6–IE9 */\r
+       background-image: -webkit-gradient(linear, left top, left bottom, from(#E97A74), to(#9f312c)); /* Saf4+, Chrome */\r
+       background-image: -webkit-linear-gradient(top, #E97A74, #9f312c); /* Chrome 10+, Saf5.1+ */\r
+       background-image:    -moz-linear-gradient(top, #E97A74, #9f312c); /* FF3.6 */\r
+       background-image:     -ms-linear-gradient(top, #E97A74, #9f312c); /* IE10 */\r
+       background-image:      -o-linear-gradient(top, #E97A74, #9f312c); /* Opera 11.10+ */\r
+       background-image:         linear-gradient(top, #E97A74, #9f312c);\r
+       filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#E97A74', EndColorStr='#9f312c'); /* IE6–IE9 */\r
        border: 1px solid #9f312c;\r
 }\r
 \r

diff --git a/share/ni_nitdoc/styles/main.css b/share/ni_nitdoc/styles/main.css
index 166ef8a..d9174f4 100644 (file)
--- a/share/ni_nitdoc/styles/main.css
+++ b/share/ni_nitdoc/styles/main.css
@@ -176,14 +176,6 @@ header nav ul li {
        color: #999;\r
 }\r
 \r
-header nav ul li a {\r
-       color: black;\r
-}\r
-\r
-header nav ul li a:hover {\r
-       color: #0D8921;\r
-}\r
-\r
 footer {\r
        text-align: center;\r
        padding-bottom: 10px;\r
@@ -193,13 +185,21 @@ footer {
 /* Main menu */\r
 \r
 header nav.main {\r
-       background: #E0E0E0 url(../resources/top_back.gif) repeat-x top left;\r
+       background: #f1f1f1;\r
+       border-bottom: 1px solid #ddd;\r
        padding: 7px 0;\r
 }\r
 \r
 header nav.main ul li.current {\r
        background: #0D8921;\r
-       color: white;\r
+       border-radius: 2px;\r
+       -moz-border-radius: 2px;\r
+       -webkit-border-radius: 2px;\r
+       border: 1px solid #1d7900;\r
+       color: #fff;\r
+       text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
+       -moz-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
+       -webkit-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);\r
 }\r
 \r
 /* Sidebar */\r
@@ -207,7 +207,7 @@ header nav.main ul li.current {
 .sidebar nav {\r
        margin: 20px;\r
        width: 208px;\r
-       border: 1px solid #CCC;\r
+       border: 1px solid #ddd;\r
 }\r
 \r
 .sidebar nav:first-child {\r
@@ -217,7 +217,7 @@ header nav.main ul li.current {
 .sidebar nav h3 {\r
        margin: 0;\r
        padding: 5px;\r
-       background: #CCC;\r
+       background: #f1f1f1;\r
        font-size: 1em;\r
 }\r
 \r