Skip to content

Commit

Permalink
Parser: Update bootstrap to 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
SMillerDev committed May 4, 2018
1 parent 5fda93c commit 066bdd6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 32 deletions.
16 changes: 5 additions & 11 deletions src/PHPDraft/Out/HTML/default.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ use Enjoy\HttpStatusCode\Statuscodes;
<title><?= $this->base_data['TITLE']; ?></title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet" crossorigin="anonymous">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.12/css/all.css" integrity="sha384-G0fIWCsCzJIMAVNQPfjH08cyYaUtMwjJwqiRKxxE/rx96Uroj1BtIQ6MLJuheaO9" crossorigin="anonymous">
<?php foreach ($this->css as $style): ?>
<link rel="stylesheet" href="<?= $style ?>">
<?php endforeach; ?>
Expand Down Expand Up @@ -340,15 +340,9 @@ if (!empty($extras)):
<?php foreach ($this->js as $js): ?>
<script src="<?= $js ?>"></script>
<?php endforeach; ?>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity="sha256-3edrmyuQ0w65f8gfBsqowzjJe2iM6n0nKciPUp8y+7E="
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
<script><?= Minifier::minify_js(file_get_contents($this->find_include_file($this->template, 'js'), true)); ?></script>
</body>
</html>
7 changes: 2 additions & 5 deletions src/PHPDraft/Out/HTML/material.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ use Enjoy\HttpStatusCode\Statuscodes;
<title><?= $this->base_data['TITLE']; ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet"
href="https://code.getmdl.io/1.3.0/material.<?= $this->base_data['COLOR_1'] ?>-<?= $this->base_data['COLOR_2'] ?>.min.css"/>
<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.<?= $this->base_data['COLOR_1'] ?>-<?= $this->base_data['COLOR_2'] ?>.min.css"/>
<script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
<script src="https://code.jquery.com/jquery-2.2.4.min.js"
integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<?php foreach ($this->css as $style): ?>
<link rel="stylesheet" href="<?= $style ?>">
<?php endforeach; ?>
Expand Down
16 changes: 5 additions & 11 deletions tests/statics/drafter/html/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<title>Tesla Model S JSON API</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet" crossorigin="anonymous">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.12/css/all.css" integrity="sha384-G0fIWCsCzJIMAVNQPfjH08cyYaUtMwjJwqiRKxxE/rx96Uroj1BtIQ6MLJuheaO9" crossorigin="anonymous">
<style>
var.url-param{font-weight:bold}var.url-value{color:#c90c00;padding:2px}div.main-url{text-align:justify;line-break:loose;word-break:break-all}button.extra-info.btn{position:fixed;bottom:10px;left:10px;border-radius:30px}button.extra-info.btn:focus{border-width:0;box-shadow:none;outline:0}.request-card>code,.popover-content{word-break:break-all}body .media h1.media-heading{margin-top:20px;margin-bottom:10px}body .media h1.media-heading .form-control{display:flex;width:auto;float:right}div.card{margin:10px auto}.card-title var,h4.response var{padding:6px 12px;margin-right:12px;border-radius:3px;display:inline-block;background:rgba(0,0,0,.1)}h4.response.warning var{background:rgba(255,103,8,.2)}h4.response.error var{background:rgba(201,12,0,.1)}.card-title code{color:#000;background-color:rgba(255,255,255,.7);padding:1px 4px;margin-top:2px;border:1px solid transparent;border-radius:3px}.card-title a.transition-title{padding:6px 0}body .col-md-10 h2:first-child,body .col-md-10 h3:first-child{margin-top:0}.method-nav ul{padding-left:10px}.method-nav ul li{list-style:none}.method-nav ul li a{line-height:26px}.method-nav ul li a i{color:#fff;padding:0 5px;box-sizing:padding-box;border-radius:15px;line-height:22px}.example-value{color:rgba(0,0,0,.4);text-align:right}a.code{padding:2px 4px;font-size:90%;background-color:#f9f2f4;border-radius:4px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace}.popover{width:auto;max-width:50%}.popover-content{width:auto;max-width:100%;line-break:normal;white-space:pre-wrap}.card-body{position:relative}.curl.btn,.hurl.btn{z-index:999;position:absolute;top:15px}.curl.btn{right:15px;border-top-left-radius:0;border-bottom-left-radius:0}.hurl.btn{right:54px;border-top-right-radius:0;border-bottom-right-radius:0}body{--put-color:rgb(248,148,6);--post-color:rgb(98,196,98);--get-color:rgb(91,192,222);--delete-color:rgb(238,95,91);--head-color:rgb(222,121,91);--patch-color:rgb(196,98,196)}.PUT:not(.structure)>.card-header{background:var(--put-color)}span.PUT{color:var(--put-color)}.POST:not(.structure)>.card-header{background:var(--post-color)}span.POST{color:var(--post-color)}.GET:not(.structure)>.card-header{background:var(--get-color)}span.GET{color:var(--get-color)}.DELETE:not(.structure)>.card-header{background:var(--delete-color)}span.DELETE{color:var(--delete-color)}.HEAD:not(.structure)>.card-header{background:var(--head-color)}span.HEAD{color:var(--head-color)}.PATCH:not(.structure)>.card-header{background:var(--patch-color)}span.PATCH{color:var(--patch-color)} </style>
</head>
Expand Down Expand Up @@ -3278,15 +3278,9 @@ <h5>Headers</h5>
data-content="<p>EXTRA_HOSTS: https://test.owner-api.teslamotors.com</p><p>SOMETHING: INFO</p><p>host: https://owner-api.teslamotors.com</p>">
<i class="fas fa-question-circle"></i>
</button>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity="sha256-3edrmyuQ0w65f8gfBsqowzjJe2iM6n0nKciPUp8y+7E="
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
<script>$(function(){$('[data-toggle="popover"]').popover();$('body').on('click',function(e){$('[data-toggle="popover"]').each(function(){if(!$(this).is(e.target)&&$(this).has(e.target).length===0&&$('.popover').has(e.target).length===0){$(this).popover('hide')}})});var selectedhost=$('h1.media-heading select.form-control').val();$('h1.media-heading select.form-control').on('change',function(){var html=$('body>div>div.row').html();var re=new RegExp(escapeRegExp(selectedhost),'g');html=html.replace(re,$('h1.media-heading select.form-control').val());selectedhost=$('h1.media-heading select.form-control').val();$('body>div>div.row').html(html);$('[data-toggle="popover"]').popover()});function escapeRegExp(str){return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")};$('table:not(.table)').each(function(){$(this).addClass('table')})});$('.collapse.request-card').on('shown.bs.collapse',function(){$(this).parent().find('h6.request .fas.indicator').removeClass('fa-angle-up').addClass('fa-angle-down')}).on('hidden.bs.collapse',function(){$(this).parent().find('h6.request .fas.indicator').removeClass('fa-angle-down').addClass('fa-angle-up')});$('.collapse.response-card').on('shown.bs.collapse',function(){$(this).parent().find('h6.response .fas.indicator').removeClass('fa-angle-up').addClass("fa-angle-down")}).on('hidden.bs.collapse',function(){$(this).parent().find('h6.response .fas.indicator').removeClass('fa-angle-down').addClass("fa-angle-up")});$('pre.collapse.response-body').on('shown.bs.collapse',function(){$(this).parent().find('h6.response-body .fas.indicator').removeClass('fa-angle-up').addClass('fa-angle-down')}).on('hidden.bs.collapse',function(){$(this).parent().find('h6.response-body .fas.indicator').removeClass('fa-angle-down').addClass('fa-angle-up')});</script>
</body>
</html>
7 changes: 2 additions & 5 deletions tests/statics/drafter/html/material.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
<title>Tesla Model S JSON API</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet"
href="https://code.getmdl.io/1.3.0/material.green-light_green.min.css"/>
<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.green-light_green.min.css"/>
<script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
<script src="https://code.jquery.com/jquery-2.2.4.min.js"
integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<style>
.phpdrafter-layout-transparent{background:rgba(0,0,0,0) center/cover}.phpdrafter-layout-transparent .mdl-layout__header,.phpdrafter-layout-transparent .mdl-layout__drawer-button{ color:white}main{width:100%}.phpdrafter-card-wide.mdl-card{width:100%;margin-bottom:30px}.phpdrafter-card-wide>.mdl-card__title{color:#fff;height:176px;background:#ccc center/cover}.phpdrafter-card-wide>.mdl-card__menu{color:#fff}h2.mdl-card__title-text{display:inline-block;width:100%}li.mdl-list__ite code{font-size:12px;font-weight:normal}.page-content{width:80%;margin:0 auto}.pull-right{text-align:right!important;float:right!important}.text-success{color:#3c763d}.text-warning{color:#8a6d3b}.text-error{color:#761c19}table.table p{margin-bottom:0}div .mdl-card__supporting-text table{width:100%;max-width:100%;border:0 solid #000}div .mdl-card__supporting-text{width:96%;padding:2%}.mdl-card__supporting-text .list-group-item.mdl-list__item{padding:8px;width:100%;clear:both;display:block;text-align:end;font-size:13px;border-bottom:1px solid #ccc;line-height:31px}.mdl-card__supporting-text .list-group-item.mdl-list__item:last-of-type{border-bottom:0 solid #ccc}.showSearch{background:#122b40 center/cover;color:#ccc}dialog{width:1000px!important;height:-moz-fit-content;height:-webkit-fit-content;height:fit-content;margin:auto;border:solid;padding:1em;background:white;color:black;display:block}dialog textarea{width:100%;max-width:100%;line-break:strict;word-break:break-all;border-color:#ccc;height:100%}dialog .mdl-textfield{width:100%}dialog:not([open]){display:none}dialog+.backdrop{position:fixed;top:0;right:0;bottom:0;left:0;background:rgba(0,0,0,.1)}._dialog_overlay{position:fixed;top:0;right:0;bottom:0;left:0}dialog.fixed{position:fixed;top:50%;transform:translate(0,-50%)}body{--put-color:rgb(248,148,6);--post-color:rgb(98,196,98);--get-color:rgb(91,192,222);--delete-color:rgb(238,95,91);--head-color:rgb(222,121,91);--patch-color:rgb(196,98,196)}.mdl-card__title a{color:inherit}.PUT .mdl-card__title{background:var(--put-color)}.POST .mdl-card__title{background:var(--post-color)}.GET .mdl-card__title{background:var(--get-color)}.DELETE .mdl-card__title{background:var(--delete-color)}.HEAD .mdl-card__title{background:var(--head-color)}.PATCH .mdl-card__title{background:var(--patch-color)} </style>
</head>
Expand Down

0 comments on commit 066bdd6

Please sign in to comment.