Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/oas3

2017-06-06 14:11:20 -07:00
parent 7deff73eea 4038b11d69
commit ccda3df4be
17 changed files with 381 additions and 227 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/_layout.scss
+++ b/src/style/_layout.scss
@@ -258,6 +258,7 @@ body
    }

    .opblock-summary-path,
+    .opblock-summary-operation-id,
    .opblock-summary-path__deprecated
    {
        font-size: 16px;
@@ -296,6 +297,11 @@ body
        text-decoration: line-through;
    }

+    .opblock-summary-operation-id
+    {
+        font-size: 14px;
+    }
+
    .opblock-summary-description
    {
        font-size: 13px;