Merge branch 'operationId'

# Conflicts: # src/core/components/operation.jsx
2017-06-06 17:23:04 +03:00
parent fdcdb831eb e3f872ad63
commit 78af4e7f9f
27 changed files with 7191 additions and 108 deletions
--- a/src/style/_buttons.scss
+++ b/src/style/_buttons.scss
@@ -58,7 +58,7 @@

    &.execute
    {
-        animation: pulse 2s infinite;
+        animation: swagger-ui-pulse 2s infinite;

        color: #fff;
        border-color: #4990e2;
@@ -66,7 +66,7 @@
 }


-@keyframes pulse
+@keyframes swagger-ui-pulse
 {
    0%
    {
--- a/src/style/_information.scss
+++ b/src/style/_information.scss
@@ -13,13 +13,18 @@
            font-size: 12px;
        }
    }
-    p
+    p, li, table
    {
        font-size: 14px;

        @include text_body();
    }

+    h1, h2, h3, h4, h5
+    {
+        @include text_body();
+    }
+
    code
    {
        padding: 3px 5px;