Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
opnarius committed Aug 17, 2017
2 parents 81841e3 + 6e2192e commit 582aaf2
Show file tree
Hide file tree
Showing 18 changed files with 204 additions and 160 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

### 1.6.0
- sync about:support styling with default
- sync about:permissions styling with default
- add image document favicon when viewing standalone images
- fix "learn more" links in notification popups
- sync devtools styling with default
- allow extensions to style their own toolbarbutton-badge
- add about:permissions icon to appmenu

### 1.5.0
- support PM27's devtools
- drop PM26 support
Expand Down
2 changes: 1 addition & 1 deletion src/install.rdf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<Description about="urn:mozilla:install-manifest">
<em:id>[email protected]</em:id>
<em:version>1.4.01</em:version>
<em:version>1.6.0</em:version>
<em:name>Noia Moon</em:name>
<em:description>Theme for Pale Moon based on Noia Iconpack by Carlitus (deviantART). Fork of "Noia Fox" by David.Vincent</em:description>
<em:creator>Pale Moon Add-Ons Team</em:creator>
Expand Down
18 changes: 0 additions & 18 deletions src/theme/chrome/noia/browser/browser.css
Original file line number Diff line number Diff line change
Expand Up @@ -4728,24 +4728,6 @@ html|*#gcli-output-frame {
-moz-margin-end: 0;
}

.toolbarbutton-badge[badge=""] {
display: none;
}
.toolbarbutton-badge[badge]:not([badge=""])::after {
/* The |content| property is set in the content stylesheet. */
font-size: 9px;
font-weight: bold;
padding: 0 1px;
color: #fff;
background-color: rgb(240,61,37);
border: 1px solid rgb(216,55,34);
border-radius: 2px;
box-shadow: 0 1px 0 rgba(0,39,121,0.77);
position: absolute;
top: 0;
right: 0;
}

#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
top: 1px;
right: 1px;
Expand Down
Binary file added src/theme/chrome/noia/browser/imagedocument.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 22 additions & 2 deletions src/theme/chrome/noia/browser/preferences/aboutPermissions.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
border : none;
}

#permissions-pagetitle {
display: none;
}

/* sites box */

#sites-box {
Expand Down Expand Up @@ -69,8 +73,6 @@ richlistbox:focus > richlistitem[selected="true"] {
/* permissions box */

#permissions-box {
background: linear-gradient(145deg, #CED2E0, #EFF2FA 40%, #CED2E0 70%);
/* background : #DADCE4; */
padding-top: 10px;
overflow-y: auto;
border-left : 1px solid #808080;
Expand All @@ -87,6 +89,10 @@ richlistbox:focus > richlistitem[selected="true"] {
margin-bottom: 0;
}

#site-visit-count {
margin-bottom: 0;
}

#defaults-description {
font-size: 125%;
font-weight: bold;
Expand All @@ -111,24 +117,34 @@ richlistbox:focus > richlistitem[selected="true"] {
.pref-icon[type="password"] {
list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
}

.pref-icon[type="cookie"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
}

.pref-icon[type="desktop-notification"] {
list-style-image: url(chrome://browser/skin/notification-64.png);
}

.pref-icon[type="geo"] {
list-style-image: url(chrome://browser/skin/icons/Geolocation-64.png);
}

.pref-icon[type="indexedDB"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
}

.pref-icon[type="install"] {
list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
}

.pref-icon[type="popup"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
}
.pref-icon[type="image"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
}

.pref-icon[type="plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric36.png);
}
Expand All @@ -137,6 +153,10 @@ richlistbox:focus > richlistitem[selected="true"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
}

.pref-icon[type="pointerLock"] {
list-style-image: url(chrome://browser/skin/pointerLock-64.png);
}

.pref-title {
font-size: 125%;
margin-bottom: 0;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 34 additions & 7 deletions src/theme/chrome/noia/global/aboutSupport.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
html {
height: 100%;
background: url(chrome://broswer/skin/icons/box-background.png) repeat-x bottom fixed #cdced3;
background: url(chrome://browser/skin/icons/box-background.png) repeat-x bottom fixed #cdced3;
font: message-box;
}

body {
color: #000;
margin: 2em 4em;
padding: 1em;
padding: 3em;
padding-left: 30px;
border: 1px solid #808080;
border-radius: 10px;
background: #fff;
Expand All @@ -26,6 +28,10 @@ a:visited {
color: #62d;
}

h1 {
text-shadow: #a0a0a0 1px 1px 0;
}

.major-section {
font-size: large;
text-align: start;
Expand Down Expand Up @@ -105,7 +111,7 @@ tr:first-child td {
overflow: hidden;
}

#reset-box {
#action-box {
background-color: #F0F0F0;
border: 1px solid #A0A0A0;
color: #000000;
Expand All @@ -118,16 +124,37 @@ tr:first-child td {
width: 30%;
}

body[dir="rtl"] > #reset-box,
#reset-box:-moz-dir(rtl) {
#contents {
clear: right;
}

#action-box,
#reset-box,
#safe-mode-box {
display: none;
}

#action-box:-moz-dir(rtl) {
float: left;
}

#reset-box > h3 {
margin-top: 0;
}

#reset-box > button {
#action-box button {
display: block;
margin: auto;
}

#verify-place-result {
max-height: 200px;
overflow: auto;
}

.block {
display: block;
}

.hidden {
display: none;
}
4 changes: 4 additions & 0 deletions src/theme/chrome/noia/global/cutemenus.css
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,10 @@ menuitem[command="cmd_CustomizeToolbars"],
list-style-image:url(chrome://global/skin/CuteMenus/Cleanup.png);
}

#appmenu_permissions,#menu_openPermissions {
list-style-image:url(chrome://browser/skin/preferences/permission.png);
}

#privateBrowsingItem,#appmenu_privateBrowsing,
#appmenu_newPrivateWindow {
list-style-image:url(chrome://browser/skin/icons/Privacy-16.png);
Expand Down
4 changes: 2 additions & 2 deletions src/theme/chrome/noia/global/devtools/filetype-dir-close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/theme/chrome/noia/global/devtools/filetype-dir-open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/theme/chrome/noia/global/devtools/filetype-globe.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/theme/chrome/noia/global/devtools/filetype-store.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 582aaf2

Please sign in to comment.