Browse Source

Update luthfi/formfield to dev-master version

Update styles based on updated formfield
pull/18/head
Nafies Luthfi 7 years ago
parent
commit
322a685bcf
  1. 2
      composer.json
  2. 20
      composer.lock
  3. 4
      public/assets/css/app.css
  4. 41
      resources/assets/sass/app.scss

2
composer.json

@ -10,7 +10,7 @@
"guzzlehttp/guzzle": "^6.3", "guzzlehttp/guzzle": "^6.3",
"laracasts/presenter": "^0.2.1", "laracasts/presenter": "^0.2.1",
"laravel/framework": "5.5.*", "laravel/framework": "5.5.*",
"luthfi/formfield": "^0.2.7",
"luthfi/formfield": "dev-master",
"riskihajar/terbilang": "^1.2", "riskihajar/terbilang": "^1.2",
"spatie/laravel-fractal": "^5.0" "spatie/laravel-fractal": "^5.0"
}, },

20
composer.lock

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "2bc96e7774d2ea1a74f716dc9d8dee43",
"content-hash": "d720dc6d101ec4c6cc8eb4e3b09c289d",
"packages": [ "packages": [
{ {
"name": "backup-manager/backup-manager", "name": "backup-manager/backup-manager",
@ -938,20 +938,20 @@
}, },
{ {
"name": "luthfi/formfield", "name": "luthfi/formfield",
"version": "0.2.8",
"version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nafiesl/FormField.git", "url": "https://github.com/nafiesl/FormField.git",
"reference": "ee183f6ff92b34eecb18ca5335073de5061b76be"
"reference": "9c925e5f1f51ff0099d4cf20c8f88afd5e84885e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nafiesl/FormField/zipball/ee183f6ff92b34eecb18ca5335073de5061b76be",
"reference": "ee183f6ff92b34eecb18ca5335073de5061b76be",
"url": "https://api.github.com/repos/nafiesl/FormField/zipball/9c925e5f1f51ff0099d4cf20c8f88afd5e84885e",
"reference": "9c925e5f1f51ff0099d4cf20c8f88afd5e84885e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"laravelcollective/html": "5.3.* || 5.4.* || 5.5.* || 5.6.*",
"laravelcollective/html": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*",
"php": ">=5.6.4" "php": ">=5.6.4"
}, },
"require-dev": { "require-dev": {
@ -985,8 +985,8 @@
"email": "nafiesl@gmail.com" "email": "nafiesl@gmail.com"
} }
], ],
"description": "Laravel Form Field the extension of Laravelcollective Form for Laravel 5.3, 5.4 and 5.5 with Twitter Bootstrap 3",
"time": "2018-06-25T14:09:59+00:00"
"description": "Laravel Form Field the extension of Laravelcollective Form for Laravel 5.3 and newer with Twitter Bootstrap 3",
"time": "2018-09-11T15:14:39+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
@ -4654,7 +4654,9 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [],
"stability-flags": {
"luthfi/formfield": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {

4
public/assets/css/app.css
File diff suppressed because it is too large
View File

41
resources/assets/sass/app.scss

@ -10,10 +10,6 @@
* For details, see http://www.apache.org/licenses/LICENSE-2.0. * For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/ */
body {
// font-family: "trebuchet ms", Helvetica, serif;
}
ul, ol { ul, ol {
margin-bottom: 0; margin-bottom: 0;
padding-left: 20px; padding-left: 20px;
@ -78,10 +74,6 @@ label.control-label {
padding: 0; padding: 0;
position: relative; position: relative;
} }
/*
.hidden-xs {
display: block;
}*/
nav.hidden-md { nav.hidden-md {
display: none; display: none;
@ -100,19 +92,10 @@ label.control-label {
.index-search-form { .index-search-form {
width: 50%; width: 50%;
} }
/*.dropdown:hover .dropdown-menu {
display: block;
}
.navbar-default .navbar-nav>li>a:hover {
color: #555;
background-color: #eee;
}*/
} }
.form-error { .form-error {
color: #d9534f; color: #d9534f;
/*font-weight: 700;*/
} }
div.notifier { div.notifier {
@ -176,18 +159,24 @@ h3.site-description {
height: 30px; height: 30px;
padding: 3px 6px; padding: 3px 6px;
} }
/*
.btn {
padding: 3px 6px;
}
.btn-xs {
padding: 1px 5px;
}*/
@media print { @media print {
#page-wrapper { #page-wrapper {
margin-left: 0; margin-left: 0;
} }
}
.radio input[type=radio] {
margin-left: 0;
}
.checkbox input[type=checkbox] {
margin-left: 0;
}
.checkbox-inline, .radio-inline {
margin-top: 0;
margin-right: 10px;
padding-left: 0;
}
.checkbox-inline+.checkbox-inline, .radio-inline+.radio-inline {
margin-left: 0;
} }
Loading…
Cancel
Save