Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2016-09-06 20:47:34 +0100
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
393f6047f26a0f6f44cf29cacd85c36cc196e077
393f6047
1 parent
d94fc5b6
Updated table styling to ideally by more predictable
Set styles to be fixed and not cut text.
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
23 deletions
resources/assets/js/pages/page-form.js
resources/assets/sass/_html.scss
resources/assets/sass/_pages.scss
resources/assets/sass/_tables.scss
resources/assets/js/pages/page-form.js
View file @
393f604
...
...
@@ -50,7 +50,7 @@ function editorPaste(e, editor) {
function
registerEditorShortcuts
(
editor
)
{
// Headers
for
(
let
i
=
1
;
i
<
5
;
i
++
)
{
editor
.
addShortcut
(
'
ctrl
+'
+
i
,
''
,
[
'FormatBlock'
,
false
,
'h'
+
i
]);
editor
.
addShortcut
(
'
meta
+'
+
i
,
''
,
[
'FormatBlock'
,
false
,
'h'
+
i
]);
}
// Other block shortcuts
...
...
resources/assets/sass/_html.scss
View file @
393f604
*
{
box-sizing
:
border-box
;
}
html
{
background-color
:
#FFFFFF
;
height
:
100%
;
...
...
@@ -9,6 +10,7 @@ html {
overflow-y
:
hidden
;
}
}
body
{
font-family
:
$text
;
font-size
:
$fs-m
;
...
...
@@ -20,15 +22,3 @@ body {
button
{
font-size
:
100%
;
}
\ No newline at end of file
table
{
min-width
:
100px
;
td
,
th
{
min-width
:
10px
;
padding
:
4px
6px
;
border
:
1px
solid
#DDD
;
}
td
p
,
th
p
{
margin
:
0
;
}
}
\ No newline at end of file
...
...
resources/assets/sass/_pages.scss
View file @
393f604
...
...
@@ -66,9 +66,10 @@
margin
:
$-m
0
;
}
table
{
word-break
:
break-all
;
word-break
:
break-word
;
hyphens
:
auto
;
table-layout
:
fixed
;
max-width
:
100%
;
height
:
auto
!
important
;
}
}
...
...
resources/assets/sass/_tables.scss
View file @
393f604
table
{
min-width
:
100px
;
max-width
:
100%
;
thead
{
background-color
:
#F8F8F8
;
font-weight
:
500
;
}
td
,
th
{
min-width
:
10px
;
padding
:
6px
8px
;
border
:
1px
solid
#DDD
;
overflow
:
auto
;
line-height
:
1
.2
;
}
td
p
,
th
p
{
margin
:
0
;
}
}
table
.table
{
width
:
100%
;
...
...
@@ -9,6 +27,7 @@ table.table {
border
:
none
;
padding
:
$-xs
$-xs
;
vertical-align
:
middle
;
margin
:
0
;
}
th
{
font-weight
:
bold
;
...
...
@@ -18,14 +37,6 @@ table.table {
}
}
table
{
max-width
:
100%
;
thead
{
background-color
:
#F8F8F8
;
font-weight
:
500
;
}
}
table
.no-style
{
td
{
border
:
0
;
...
...
Please
register
or
sign in
to post a comment