mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 03:57:21 +00:00
Code Issues Releases Wiki Activity

Update to latest version of normalize.css and fix tab styling

Browse Source 
Tab styling was inconsistent on Firefox due to some line-height issues.
This commit is contained in:
Jermolene 2014-03-12 20:05:34 +00:00
parent d0caf21b2d
commit 5ba92fe274
7 changed files with 207 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/palettes/Blanca.tid
View File

@ -45,6 +45,7 @@ page-background: #ffffff
pre-background: #f5f5f5 pre-background: #f5f5f5
pre-border: #cccccc pre-border: #cccccc
primary: #7897f3 primary: #7897f3
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #000000 sidebar-controls-foreground-hover: #000000
sidebar-controls-foreground: #ccc sidebar-controls-foreground: #ccc
sidebar-foreground-shadow: rgba(255,255,255, 0.8) sidebar-foreground-shadow: rgba(255,255,255, 0.8)

1
core/palettes/Blue.tid
View File

@ -45,6 +45,7 @@ page-background: #ddddff
pre-background: #f5f5f5 pre-background: #f5f5f5
pre-border: #cccccc pre-border: #cccccc
primary: #5778d8 primary: #5778d8
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #000000 sidebar-controls-foreground-hover: #000000
sidebar-controls-foreground: #ffffff sidebar-controls-foreground: #ffffff
sidebar-foreground-shadow: rgba(255,255,255, 0.8) sidebar-foreground-shadow: rgba(255,255,255, 0.8)

1
core/palettes/Contrast.tid
View File

@ -45,6 +45,7 @@ page-background: #000000
pre-background: #f5f5f5 pre-background: #f5f5f5
pre-border: #cccccc pre-border: #cccccc
primary: #5778d8 primary: #5778d8
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #000000 sidebar-controls-foreground-hover: #000000
sidebar-controls-foreground: #ffffff sidebar-controls-foreground: #ffffff
sidebar-foreground-shadow: rgba(255,0,0, 0.5) sidebar-foreground-shadow: rgba(255,0,0, 0.5)

1
core/palettes/Vanilla.tid
View File

@ -45,6 +45,7 @@ page-background: #ececec
pre-background: #f5f5f5 pre-background: #f5f5f5
pre-border: #cccccc pre-border: #cccccc
primary: #5778d8 primary: #5778d8
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground-hover: #000000 sidebar-controls-foreground-hover: #000000
sidebar-controls-foreground: #ffffff sidebar-controls-foreground: #ffffff
sidebar-foreground-shadow: rgba(255,255,255, 0.8) sidebar-foreground-shadow: rgba(255,255,255, 0.8)

2
core/ui/TagManager.tid
View File

@ -7,7 +7,7 @@ title: $:/TagManager
<th>Count</th> <th>Count</th>
<th>Colour</th> <th>Colour</th>
</tr> </tr>
<$list filter="[tags[]sort[title]]"> <$list filter="[tags[]!is[system]sort[title]]">
<tr> <tr>
<td><$transclude tiddler="$:/core/ui/TagTemplate"/></td> <td><$transclude tiddler="$:/core/ui/TagTemplate"/></td>
<td><$count filter="[is[current]tagging[]]"/></td> <td><$count filter="[is[current]tagging[]]"/></td>

13
themes/tiddlywiki/vanilla/base.tid
View File

@ -14,12 +14,17 @@ tags: [[$:/tags/stylesheet]]
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
} }
html button {
line-height: 1.2;
}
/* /*
** Basic element styles ** Basic element styles
*/ */
html { html {
font-family: {{$:/themes/tiddlywiki/vanilla/settings##fontfamily}}; font-family: {{$:/themes/tiddlywiki/vanilla/settings##fontfamily}};
text-rendering: optimizeLegibility; /* Enables kerning and ligatures etc. */
} }
body.tw-body { body.tw-body {
@ -240,7 +245,11 @@ a.tw-tiddlylink-external:hover {
line-height: 1.4em; line-height: 1.4em;
} }
.btn-mini { .tw-sidebar-lists button {
color: <<colour sidebar-button-foreground>>;
}
.tw-sidebar-lists button.btn-mini {
color: <<colour sidebar-muted-foreground>>; color: <<colour sidebar-muted-foreground>>;
} }
@ -874,7 +883,6 @@ canvas.tw-edit-bitmapeditor {
.tw-tab-buttons { .tw-tab-buttons {
font-size: 0.85em; font-size: 0.85em;
line-height: 100%;
padding-top: 1em; padding-top: 1em;
margin-bottom: -1px; margin-bottom: -1px;
} }
@ -889,6 +897,7 @@ canvas.tw-edit-bitmapeditor {
.tw-tab-buttons button { .tw-tab-buttons button {
color: <<colour tab-foreground>>; color: <<colour tab-foreground>>;
padding: 2px 4px 4px 4px;
margin-left: 2px; margin-left: 2px;
margin-right: 2px; margin-right: 2px;
font-weight: 300; font-weight: 300;

355
themes/tiddlywiki/vanilla/reset.tid
View File

@ -1,10 +1,29 @@
title: $:/themes/tiddlywiki/vanilla/reset title: $:/themes/tiddlywiki/vanilla/reset
type: text/plain type: text/plain
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ /*! normalize.css v3.0.0 | MIT License | git.io/normalize */
/* ========================================================================== /**
HTML5 display definitions * 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* HTML5 display definitions
========================================================================== */ ========================================================================== */
/** /**
@ -23,17 +42,20 @@ main,
nav, nav,
section, section,
summary { summary {
display: block; display: block;
} }
/** /**
* Correct `inline-block` display not defined in IE 8/9. * 1. Correct `inline-block` display not defined in IE 8/9.
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
*/ */
audio, audio,
canvas, canvas,
progress,
video { video {
display: inline-block; display: inline-block; /* 1 */
vertical-align: baseline; /* 2 */
} }
/** /**
@ -42,52 +64,29 @@ video {
*/ */
audio:not([controls]) { audio:not([controls]) {
display: none; display: none;
height: 0; height: 0;
} }
/** /**
* Address styling not present in IE 8/9. * Address `[hidden]` styling not present in IE 8/9.
* Hide the `template` element in IE, Safari, and Firefox < 22.
*/ */
[hidden] { [hidden],
display: none; template {
display: none;
} }
/* ========================================================================== /* Links
Base
========================================================================== */ ========================================================================== */
/** /**
* 1. Set default font family to sans-serif. * Remove the gray background color from active links in IE 10.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/ */
html { a {
font-family: sans-serif; /* 1 */ background: transparent;
-webkit-text-size-adjust: 100%; /* 2 */
-ms-text-size-adjust: 100%; /* 2 */
}
/**
* Remove default margin.
*/
body {
margin: 0;
}
/* ==========================================================================
Links
========================================================================== */
/**
* Address `outline` inconsistency between Chrome and other browsers.
*/
a:focus {
outline: thin dotted;
} }
/** /**
@ -96,29 +95,18 @@ a:focus {
a:active, a:active,
a:hover { a:hover {
outline: 0; outline: 0;
} }
/* ========================================================================== /* Text-level semantics
Typography
========================================================================== */ ========================================================================== */
/**
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari 5, and Chrome.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/** /**
* Address styling not present in IE 8/9, Safari 5, and Chrome. * Address styling not present in IE 8/9, Safari 5, and Chrome.
*/ */
abbr[title] { abbr[title] {
border-bottom: 1px dotted; border-bottom: 1px dotted;
} }
/** /**
@ -127,7 +115,7 @@ abbr[title] {
b, b,
strong { strong {
font-weight: bold; font-weight: bold;
} }
/** /**
@ -135,17 +123,17 @@ strong {
*/ */
dfn { dfn {
font-style: italic; font-style: italic;
} }
/** /**
* Address differences between Firefox and other browsers. * Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari 5, and Chrome.
*/ */
hr { h1 {
-moz-box-sizing: content-box; font-size: 2em;
box-sizing: content-box; margin: 0.67em 0;
height: 0;
} }
/** /**
@ -153,36 +141,8 @@ hr {
*/ */
mark { mark {
background: #ff0; background: #ff0;
color: #000; color: #000;
}
/**
* Correct font family set oddly in Safari 5 and Chrome.
*/
code,
kbd,
pre,
samp {
font-family: monospace, serif;
font-size: 1em;
}
/**
* Improve readability of pre-formatted text in all browsers.
*/
pre {
white-space: pre-wrap;
}
/**
* Set consistent quote types.
*/
q {
quotes: "\201C" "\201D" "\2018" "\2019";
} }
/** /**
@ -190,7 +150,7 @@ q {
*/ */
small { small {
font-size: 80%; font-size: 80%;
} }
/** /**
@ -199,22 +159,21 @@ small {
sub, sub,
sup { sup {
font-size: 75%; font-size: 75%;
line-height: 0; line-height: 0;
position: relative; position: relative;
vertical-align: baseline; vertical-align: baseline;
} }
sup { sup {
top: -0.5em; top: -0.5em;
} }
sub { sub {
bottom: -0.25em; bottom: -0.25em;
} }
/* ========================================================================== /* Embedded content
Embedded content
========================================================================== */ ========================================================================== */
/** /**
@ -222,7 +181,7 @@ sub {
*/ */
img { img {
border: 0; border: 0;
} }
/** /**
@ -230,11 +189,10 @@ img {
*/ */
svg:not(:root) { svg:not(:root) {
overflow: hidden; overflow: hidden;
} }
/* ========================================================================== /* Grouping content
Figures
========================================================================== */ ========================================================================== */
/** /**
@ -242,68 +200,82 @@ svg:not(:root) {
*/ */
figure { figure {
margin: 0; margin: 1em 40px;
} }
/* ========================================================================== /**
Forms * Address differences between Firefox and other browsers.
*/
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
/**
* Contain overflow in all browsers.
*/
pre {
overflow: auto;
}
/**
* Address odd `em`-unit font size rendering in all browsers.
*/
code,
kbd,
pre,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
/* Forms
========================================================================== */ ========================================================================== */
/** /**
* Define consistent border, margin, and padding. * Known limitation: by default, Chrome and Safari on OS X allow very limited
* styling of `select`, unless a `border` property is set.
*/ */
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
/** /**
* 1. Correct `color` not being inherited in IE 8/9. * 1. Correct color not being inherited.
* 2. Remove padding so people aren't caught out if they zero out fieldsets. * Known issue: affects color of disabled elements.
*/ * 2. Correct font properties not being inherited.
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* 1. Correct font family not being inherited in all browsers.
* 2. Correct font size not being inherited in all browsers.
* 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
*/ */
button, button,
input, input,
optgroup,
select, select,
textarea { textarea {
font-family: inherit; /* 1 */ color: inherit; /* 1 */
font-size: 100%; /* 2 */ font: inherit; /* 2 */
margin: 0; /* 3 */ margin: 0; /* 3 */
} }
/** /**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in * Address `overflow` set to `hidden` in IE 8/9/10.
* the UA stylesheet.
*/ */
button, button {
input { overflow: visible;
line-height: normal;
} }
/** /**
* Address inconsistent `text-transform` inheritance for `button` and `select`. * Address inconsistent `text-transform` inheritance for `button` and `select`.
* All other form control elements do not inherit `text-transform` values. * All other form control elements do not inherit `text-transform` values.
* Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. * Correct `button` style inheritance in Firefox, IE 8+, and Opera
* Correct `select` style inheritance in Firefox 4+ and Opera. * Correct `select` style inheritance in Firefox.
*/ */
button, button,
select { select {
text-transform: none; text-transform: none;
} }
/** /**
@ -318,8 +290,8 @@ button,
html input[type="button"], /* 1 */ html input[type="button"], /* 1 */
input[type="reset"], input[type="reset"],
input[type="submit"] { input[type="submit"] {
-webkit-appearance: button; /* 2 */ -webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */ cursor: pointer; /* 3 */
} }
/** /**
@ -328,18 +300,51 @@ input[type="submit"] {
button[disabled], button[disabled],
html input[disabled] { html input[disabled] {
cursor: default; cursor: default;
} }
/** /**
* 1. Address box sizing set to `content-box` in IE 8/9. * Remove inner padding and border in Firefox 4+.
* 2. Remove excess padding in IE 8/9. */
button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
padding: 0;
}
/**
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/
input {
line-height: normal;
}
/**
* It's recommended that you don't attempt to style these elements.
* Firefox's implementation doesn't respect box-sizing, padding, or width.
*
* 1. Address box sizing set to `content-box` in IE 8/9/10.
* 2. Remove excess padding in IE 8/9/10.
*/ */
input[type="checkbox"], input[type="checkbox"],
input[type="radio"] { input[type="radio"] {
box-sizing: border-box; /* 1 */ box-sizing: border-box; /* 1 */
padding: 0; /* 2 */ padding: 0; /* 2 */
}
/**
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
* `font-size` values of the `input`, it causes the cursor style of the
* decrement button to change from `default` to `text`.
*/
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
} }
/** /**
@ -349,44 +354,61 @@ input[type="radio"] {
*/ */
input[type="search"] { input[type="search"] {
-webkit-appearance: textfield; /* 1 */ -webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box; -moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* 2 */ -webkit-box-sizing: content-box; /* 2 */
box-sizing: content-box; box-sizing: content-box;
} }
/** /**
* Remove inner padding and search cancel button in Safari 5 and Chrome * Remove inner padding and search cancel button in Safari and Chrome on OS X.
* on OS X. * Safari (but not Chrome) clips the cancel button when the search input has
* padding (and `textfield` appearance).
*/ */
input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration { input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none; -webkit-appearance: none;
} }
/** /**
* Remove inner padding and border in Firefox 4+. * Define consistent border, margin, and padding.
*/ */
button::-moz-focus-inner, fieldset {
input::-moz-focus-inner { border: 1px solid #c0c0c0;
border: 0; margin: 0 2px;
padding: 0; padding: 0.35em 0.625em 0.75em;
} }
/** /**
* 1. Remove default vertical scrollbar in IE 8/9. * 1. Correct `color` not being inherited in IE 8/9.
* 2. Improve readability and alignment in all browsers. * 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/
legend {
border: 0; /* 1 */
padding: 0; /* 2 */
}
/**
* Remove default vertical scrollbar in IE 8/9.
*/ */
textarea { textarea {
overflow: auto; /* 1 */ overflow: auto;
vertical-align: top; /* 2 */
} }
/* ========================================================================== /**
Tables * Don't inherit the `font-weight` (applied by a rule above).
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
*/
optgroup {
font-weight: bold;
}
/* Tables
========================================================================== */ ========================================================================== */
/** /**
@ -394,6 +416,11 @@ textarea {
*/ */
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
}
td,
th {
padding: 0;
} }