Skip to content

Commit 97445d3

Browse files
committed
v3.0.0
1 parent bd3493c commit 97445d3

20 files changed

+421
-263
lines changed

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 Matthew Blode
3+
Copyright (c) 2018 Matthew Blode
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

css/marx.css

Lines changed: 115 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -548,10 +548,16 @@ footer {
548548
margin-bottom: 0; }
549549

550550
hr {
551+
border: 0;
551552
border-top: 1px solid rgba(0, 0, 0, 0.12);
552553
display: block;
554+
margin-top: 16px;
553555
margin-bottom: 16px;
554-
width: 100%; }
556+
width: 100%;
557+
-webkit-box-sizing: content-box;
558+
box-sizing: content-box;
559+
height: 0;
560+
overflow: visible; }
555561

556562
img {
557563
height: auto;
@@ -568,11 +574,16 @@ img {
568574
img {
569575
margin-right: 16px; } }
570576

577+
embed,
578+
iframe,
579+
video {
580+
border: 0; }
581+
571582
body {
572583
color: rgba(0, 0, 0, 0.8);
573-
font-family: "Helvetica Neue", Helvetica, "Lucida Grande", sans-serif;
584+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
574585
font-size: 16px;
575-
line-height: 1.4; }
586+
line-height: 1.5; }
576587

577588
p {
578589
margin: 0;
@@ -586,46 +597,39 @@ h5,
586597
h6 {
587598
color: inherit;
588599
font-family: inherit;
589-
line-height: inherit; }
600+
line-height: 1.2;
601+
font-weight: 500; }
590602

591603
h1 {
592-
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
593-
font-size: 36px;
594-
font-weight: 500;
604+
font-size: 40px;
595605
margin: 20px 0 16px; }
596606

597607
h2 {
598-
font-size: 30px;
599-
font-weight: 500;
608+
font-size: 32px;
600609
margin: 20px 0 16px; }
601610

602611
h3 {
603-
font-size: 24px;
604-
font-weight: 500;
612+
font-size: 28px;
605613
margin: 16px 0 4px; }
606614

607615
h4 {
608-
font-size: 18px;
609-
font-weight: 600;
616+
font-size: 24px;
610617
margin: 16px 0 4px; }
611618

612619
h5 {
613-
font-size: 16px;
614-
font-weight: 600;
620+
font-size: 20px;
615621
margin: 16px 0 4px; }
616622

617623
h6 {
618-
color: rgba(0, 0, 0, 0.54);
619-
font-size: 14px;
620-
font-weight: 600;
624+
font-size: 16px;
621625
margin: 16px 0 4px; }
622626

623627
small {
624628
color: rgba(0, 0, 0, 0.54);
625629
vertical-align: bottom; }
626630

627631
pre {
628-
background: #efefef;
632+
background: #f7f7f9;
629633
color: rgba(0, 0, 0, 0.8);
630634
display: block;
631635
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
@@ -647,9 +651,11 @@ code {
647651
word-wrap: break-word; }
648652

649653
a {
650-
color: #2196f3; }
654+
color: #007bff;
655+
text-decoration: none;
656+
background-color: transparent; }
651657
a:hover, a:focus {
652-
color: #2196f3;
658+
color: #0062cc;
653659
text-decoration: underline; }
654660

655661
dl {
@@ -665,7 +671,7 @@ ol {
665671
vertical-align: baseline; }
666672

667673
blockquote {
668-
border-left: 2px solid #2196f3;
674+
border-left: 2px solid rgba(0, 0, 0, 0.8);
669675
font-family: Georgia, Times, "Times New Roman", serif;
670676
font-style: italic;
671677
margin: 16px 0;
@@ -704,14 +710,22 @@ input[type="week"],
704710
input[type="number"],
705711
input[type="search"],
706712
input[type="tel"],
707-
select {
713+
select,
714+
textarea {
708715
background: #fff;
716+
background-clip: padding-box;
709717
border: 1px solid rgba(0, 0, 0, 0.12);
710718
border-radius: 4px;
711719
color: rgba(0, 0, 0, 0.8);
712-
display: inline-block;
713-
padding: 4px;
714-
vertical-align: middle; }
720+
display: block;
721+
width: 100%;
722+
padding: 8px 16px;
723+
line-height: 1.5;
724+
-webkit-transition: border-color .15s ease-in-out, -webkit-box-shadow .15s ease-in-out;
725+
transition: border-color .15s ease-in-out, -webkit-box-shadow .15s ease-in-out;
726+
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
727+
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out, -webkit-box-shadow .15s ease-in-out;
728+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; }
715729

716730
input[type="color"] {
717731
background: #fff;
@@ -722,11 +736,19 @@ input[type="color"] {
722736

723737
input:not([type]) {
724738
-webkit-appearance: none;
739+
background: #fff;
725740
background-clip: padding-box;
726741
border: 1px solid rgba(0, 0, 0, 0.12);
727742
border-radius: 4px;
728-
display: inline-block;
729-
padding: 8px;
743+
color: rgba(0, 0, 0, 0.8);
744+
display: block;
745+
width: 100%;
746+
padding: 8px 16px;
747+
line-height: 1.5;
748+
-webkit-transition: border-color .15s ease-in-out, -webkit-box-shadow .15s ease-in-out;
749+
transition: border-color .15s ease-in-out, -webkit-box-shadow .15s ease-in-out;
750+
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
751+
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out, -webkit-box-shadow .15s ease-in-out;
730752
text-align: left; }
731753

732754
input[type="text"]:focus,
@@ -745,10 +767,18 @@ input[type="tel"]:focus,
745767
input[type="color"]:focus,
746768
select:focus,
747769
textarea:focus {
748-
border-color: #2196f3; }
770+
background-color: #fff;
771+
border-color: #80bdff;
772+
outline: 0;
773+
-webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
774+
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); }
749775

750776
input:not([type]):focus {
751-
border-color: #2196f3; }
777+
background-color: #fff;
778+
border-color: #80bdff;
779+
outline: 0;
780+
-webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
781+
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); }
752782

753783
input[type="file"]:focus,
754784
input[type="radio"]:focus,
@@ -773,12 +803,14 @@ select[disabled],
773803
textarea[disabled] {
774804
background-color: rgba(0, 0, 0, 0.12);
775805
color: rgba(0, 0, 0, 0.54);
776-
cursor: not-allowed; }
806+
cursor: not-allowed;
807+
opacity: 1; }
777808

778809
input:not([type])[disabled] {
779810
background-color: rgba(0, 0, 0, 0.12);
780811
color: rgba(0, 0, 0, 0.54);
781-
cursor: not-allowed; }
812+
cursor: not-allowed;
813+
opacity: 1; }
782814

783815
input[readonly],
784816
select[readonly],
@@ -802,10 +834,15 @@ select {
802834
border: 1px solid rgba(0, 0, 0, 0.12);
803835
vertical-align: sub; }
804836

837+
select:not([size]):not([multiple]) {
838+
height: -webkit-calc(2.25rem + 2px);
839+
height: calc(2.25rem + 2px); }
840+
805841
select[multiple] {
806842
height: auto; }
807843

808844
label {
845+
display: inline-block;
809846
line-height: 2; }
810847

811848
fieldset {
@@ -822,30 +859,43 @@ legend {
822859
width: 100%; }
823860

824861
textarea {
825-
background: #fff;
826-
border: 1px solid rgba(0, 0, 0, 0.12);
827-
border-radius: 4px;
828-
display: block;
829-
margin-bottom: 8px;
830-
max-width: 100%;
831-
padding: 8px;
832-
vertical-align: middle; }
862+
overflow: auto;
863+
resize: vertical; }
864+
865+
input[type=checkbox],
866+
input[type=radio] {
867+
-webkit-box-sizing: border-box;
868+
box-sizing: border-box;
869+
padding: 0;
870+
position: absolute;
871+
margin-top: .25rem;
872+
margin-left: -1.25rem; }
833873

834874
input[type=submit],
835875
input[type=reset],
836876
input[type=button],
837877
button {
838-
background: #2196f3;
839-
border: 1px solid rgba(0, 0, 0, 0.12);
878+
background-color: #007bff;
879+
border: #007bff;
840880
border-radius: 4px;
841881
color: #fff;
842-
cursor: pointer;
843-
display: inline-block;
844-
margin: 0;
845882
padding: 8px 16px;
883+
display: inline-block;
884+
font-weight: 400;
846885
text-align: center;
886+
white-space: nowrap;
847887
vertical-align: middle;
848-
white-space: nowrap; }
888+
-webkit-user-select: none;
889+
-moz-user-select: none;
890+
-ms-user-select: none;
891+
user-select: none;
892+
border: 1px solid transparent;
893+
font-size: 1rem;
894+
line-height: 1.5;
895+
-webkit-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, -webkit-box-shadow .15s ease-in-out;
896+
transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, -webkit-box-shadow .15s ease-in-out;
897+
transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
898+
transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out, -webkit-box-shadow .15s ease-in-out; }
849899

850900
input[type=submit]::-moz-focus-inner,
851901
input[type=reset]::-moz-focus-inner,
@@ -857,36 +907,35 @@ input[type=submit]:hover,
857907
input[type=reset]:hover,
858908
input[type=button]:hover,
859909
button:hover {
860-
background: #0c7cd5;
861-
border-color: rgba(0, 0, 0, 0.54); }
862-
863-
input[type=submit]:active,
864-
input[type=reset]:active,
865-
input[type=button]:active,
866-
button:active {
867-
background: #0c7cd5;
868-
border-color: rgba(0, 0, 0, 0.54);
869-
-webkit-box-shadow: inset 0 0 4px 0 rgba(0, 0, 0, 0.2);
870-
box-shadow: inset 0 0 4px 0 rgba(0, 0, 0, 0.2);
871-
outline-offset: -2px; }
910+
background-color: #0069d9;
911+
border-color: #0062cc;
912+
color: #fff; }
913+
914+
input[type=submit]:not(:disabled):active,
915+
input[type=reset]:not(:disabled):active,
916+
input[type=button]:not(:disabled):active,
917+
button:not(:disabled):active {
918+
background-color: #0062cc;
919+
border-color: #005cbf;
920+
color: #fff; }
872921

873922
input[type=submit]:focus,
874923
input[type=reset]:focus,
875924
input[type=button]:focus,
876925
button:focus {
877-
background: #0c7cd5;
878-
border-color: rgba(0, 0, 0, 0.54);
879-
-webkit-box-shadow: inset 0 0 4px 0 rgba(0, 0, 0, 0.2);
880-
box-shadow: inset 0 0 4px 0 rgba(0, 0, 0, 0.2);
881-
outline: 0; }
926+
outline: 0;
927+
-webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
928+
box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5); }
882929

883930
input[type=submit]:disabled,
884931
input[type=reset]:disabled,
885932
input[type=button]:disabled,
886933
button:disabled {
887-
background: rgba(0, 0, 0, 0.12);
888-
color: rgba(0, 0, 0, 0.38);
889-
cursor: not-allowed; }
934+
opacity: .65;
935+
cursor: not-allowed;
936+
background-color: #007bff;
937+
border-color: #007bff;
938+
color: #fff; }
890939

891940
table {
892941
border-top: 1px solid rgba(0, 0, 0, 0.12);

css/marx.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/marx.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)