Skip to content

Commit

Permalink
add php_cs file, update styles
Browse files Browse the repository at this point in the history
  • Loading branch information
FabianHippmann committed Jul 19, 2018
1 parent 8c05a13 commit 7696b80
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 20 deletions.
25 changes: 25 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php
$finder = PhpCsFixer\Finder::create()
->notPath('bootstrap/cache')
->notPath('storage')
->notPath('vendor')
->in(__DIR__)
->name('*.php')
->notName('*.blade.php')
->ignoreDotFiles(true)
->ignoreVCS(true)
;

return PhpCsFixer\Config::create()
->setRules(array(
'@PSR2' => true,
'@Symfony' => true,
'binary_operator_spaces' => ['align_double_arrow' => false],
'array_syntax' => ['syntax' => 'short'],
'linebreak_after_opening_tag' => true,
'not_operator_with_successor_space' => true,
'ordered_imports' => true,
'phpdoc_order' => true,
))
->setFinder($finder)
;
20 changes: 8 additions & 12 deletions resources/assets/js/Snippet.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<template>
<div class="snippet">
<div class="snippet__header">
<div class="snippet__locale">
{{ item.locale }}
</div>
<div class="snippet__key">
{{ item.key }}
</div>
Expand All @@ -10,9 +13,6 @@
<div class="snippet__preview">
{{ item.value | truncate(40) }}
</div>
<div class="snippet__locale">
{{ item.locale }}
</div>
<div class="snippet__actions">
<div
class="snippet__toggle"
Expand Down Expand Up @@ -83,29 +83,30 @@ export default {
display: flex;
align-items: center;
background-color: #f5f5f5;
border-bottom: 1px solid #eaeaea;
padding: 10px 10px;
}
.snippet__headerrow {
background-color: #fff;
border-bottom: 2px solid #ececec;
}
.snippet__namespace {
flex: 0 0 230px;
flex: 0 0 120px;
color: #b7b7b7;
}
.snippet__toggle {
padding: 5px 10px;
border: 2px solid #b7f17e;
border: 1px solid #22a7f0;
cursor: pointer;
}
.snippet__locale {
flex: 0 0 100px;
flex: 0 0 50px;
}
.snippet__preview {
flex: 1;
}
.snippet__key {
flex: 0 0 180px;
flex: 0 0 210px;
height: 100%;
word-wrap: break-word;
font-weight: bold;
Expand All @@ -116,10 +117,5 @@ export default {
.snippet__actions {
justify-self: flex-end;
}
.snippet__body {
/* padding: 20px; */
/* background-color: #333; */
}
</style>

17 changes: 9 additions & 8 deletions resources/assets/js/TranslationManager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,23 @@
</div>
<div
class="tag"
@click="selectTag('locale', null)"
@click="selectFilter('locale', null)"
>
Reset
</div>
</div>
<div class="snippet__header snippet__headerrow"><div class="snippet__namespace">
Namespace
</div>
<div class="snippet__preview">
Text
<div class="snippet__header snippet__headerrow">
<div class="snippet__locale">
locale
</div>
<div class="snippet__key">
key
</div>
<div class="snippet__locale">
locale
<div class="snippet__namespace">
Namespace
</div>
<div class="snippet__preview">
Text
</div>
<div class="snippet__actions"/>
</div>
Expand Down

0 comments on commit 7696b80

Please sign in to comment.