Diff
checker
文本
文本
图像
文档
Excel
文件夹
Legal
Enterprise
桌面版
定价
登录
下载 Diffchecker 桌面版
比较文本
查找两个文本文件之间的差异
工具
历史
实时编辑器
折叠未更改行
关闭换行
视图
拆分
统一
比对精度
智能
单词
字符
语法高亮
选择语法
忽略
文本转换
转到第一个差异
编辑输入
Diffchecker Desktop
运行Diffchecker最安全的方式。获取Diffchecker桌面应用:您的差异永远不会离开您的电脑!
获取桌面版
Untitled diff
创建于
10年前
差异永不过期
清除
导出
分享
解释
27 删除
行
总计
删除
字符
总计
删除
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
300 行
全部复制
132 添加
行
总计
添加
字符
总计
添加
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
397 行
全部复制
@charset "utf-8";
@charset "utf-8";
复制
已复制
复制
已复制
/* 高亮颜色 #00c680 */
* {
* {
margin: 0;
margin: 0;
padding: 0;
padding: 0;
border: 0;
border: 0;
}
}
html, body {
html, body {
height: 100%;
height: 100%;
-moz-user-select: none;
-moz-user-select: none;
-o-user-select:none;
-o-user-select:none;
-khtml-user-select:none;
-khtml-user-select:none;
-webkit-user-select:none;
-webkit-user-select:none;
-ms-user-select:none;
-ms-user-select:none;
复制
已复制
复制
已复制
user-select:none;
/**禁止选中文字*/
user-select:none;
}
}
input:focus, a:focus {
input:focus, a:focus {
outline: none;
outline: none;
}
}
body {
body {
font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
font-weight: 200;
font-weight: 200;
background-color: #FBFBFB;
background-color: #FBFBFB;
min-width: 1100px;
min-width: 1100px;
}
}
a {
a {
text-decoration: none;
text-decoration: none;
}
}
a[href] {
a[href] {
color: #B0B0B0;
color: #B0B0B0;
}
}
a[href]:active {
a[href]:active {
color: #828689;
color: #828689;
boder: none;
boder: none;
}
}
复制
已复制
复制
已复制
.fl{
float:left;
}
.fr{
float:right;
}
.img-responsive {
.img-responsive {
width: 100%;
width: 100%;
height: auto;
height: auto;
display: block;
display: block;
border: none;
border: none;
}
}
.logo {
.logo {
复制
已复制
复制
已复制
width:
161
px;
font-size: 32px;
color: #FFF;
background: url(../images/logo.png) no-repeat;
width:
60
px;
height: 32px;
height: 32px;
float: left;
float: left;
margin: 7px 10px 11px 18px;
margin: 7px 10px 11px 18px;
}
}
复制
已复制
复制
已复制
.logo-font {
.logo i {
padding: 13px 0
;
font-size: 32px;
color: #FFF;
transition: all 1s linear
;
}
}
复制
已复制
复制
已复制
.logo
-font p, .logo-font span
{
.logo
:hover i
{
font-size: 13px;
color: #
00c680;
color: #
fff;
transition: all 0.5s
line
ar
;
line
-height: 0.6
;
}
}
.header {
.header {
width: 100%;
width: 100%;
}
}
复制
已复制
复制
已复制
/* 导航栏 */
/* header-nav */
.header-nav {
.header-nav {
width: 100%;
width: 100%;
height: 50px;
height: 50px;
position: fixed;
position: fixed;
top: 0px;
top: 0px;
left: 0px;
left: 0px;
z-index: 999;
z-index: 999;
复制
已复制
复制
已复制
background-color:
#1E1D23
;
background-color:
rgb(45, 45, 45);
;
-webkit-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
}
.logo-btn {
.logo-btn {
width: 161px;
width: 161px;
height: 32px;
height: 32px;
复制
已复制
复制
已复制
display:
block
;
display:
inline
;
}
}
复制
已复制
复制
已复制
/* 左侧功能 */
.nav-left {
.nav-left {
float: left;
float: left;
margin-left: 33px;
margin-left: 33px;
margin-top: 12px;
margin-top: 12px;
display: none;
display: none;
}
}
.nav-left a, .nav-right a {
.nav-left a, .nav-right a {
color: #FFF !important;
color: #FFF !important;
font-size: 14px;
font-size: 14px;
display: block;
display: block;
float:left;
float:left;
padding: 6.5px 15px;
padding: 6.5px 15px;
}
}
复制
已复制
复制
已复制
/* 右侧登陆注册 */
.nav-right {
.nav-right {
float: right;
float: right;
margin-top: 19px;
margin-top: 19px;
margin-right: 20px;
margin-right: 20px;
display: none;
display: none;
}
}
.nav-right a {
.nav-right a {
float: left;
float: left;
padding: 0px 10px;
padding: 0px 10px;
}
}
.login {
.login {
padding-right: 9px !important;
padding-right: 9px !important;
border-right: 1px solid #fff;
border-right: 1px solid #fff;
}
}
.nav-right input {
.nav-right input {
float:left;
float:left;
border: none;
border: none;
height: 16.5px;
height: 16.5px;
width: 30px;
width: 30px;
margin-right: 35px;
margin-right: 35px;
display: none;
display: none;
}
}
复制
已复制
复制
已复制
/* 返回按钮 */
.raturn {
.raturn {
width: 730px;
width: 730px;
height: 20px;
height: 20px;
margin: 0px auto;
margin: 0px auto;
}
}
.raturn i {
.raturn i {
height: 20px;
height: 20px;
font-size: 20px;
font-size: 20px;
display: inline-block;
display: inline-block;
color: #BDBDBD;
color: #BDBDBD;
float: left;
float: left;
}
}
.raturn a {
.raturn a {
width: 54px;
width: 54px;
height: 20px;
height: 20px;
display: block;
display: block;
float: left;
float: left;
}
}
.raturn span {
.raturn span {
font-size: 12px !important;
font-size: 12px !important;
margin-left: 5px;
margin-left: 5px;
display: inline-block;
display: inline-block;
height: 20px;
height: 20px;
line-height: 23px;
line-height: 23px;
float: left;
float: left;
}
}
.raturn a:hover span {
.raturn a:hover span {
color: #44545E;
color: #44545E;
}
}
.raturn a:hover i {
.raturn a:hover i {
color: #44545E;
color: #44545E;
}
}
复制
已复制
复制
已复制
.friend-link {
width: 48%;
margin-top: 160px !important;
margin-left: auto;
margin-right: auto;
font-size:12px;
color:#333333;
letter-spacing:0px;
}
.friend-link p{
font-family:PingFangSC-Regular;
font-size:12px;
color:#a2a1a1;
letter-spacing:0px;
height:20px;
line-height:20px;
}
.friend-link .flink-title{
color:#333333;
}
/* footer */
/* footer */
.footer {
.footer {
width: 100%;
width: 100%;
min-width: 1100px;
min-width: 1100px;
height: 55px;
height: 55px;
复制
已复制
复制
已复制
margin-top:
3
0px;
margin-top:
5
0px;
text-align: center;
text-align: center;
color: #B0B0B0;
color: #B0B0B0;
font-size: 12px;
font-size: 12px;
line-height: 55px;
line-height: 55px;
font-weight: 300;
font-weight: 300;
float: left;
float: left;
cursor: default;
cursor: default;
z-index: 12;
z-index: 12;
}
}
.footer-border {
.footer-border {
width: 70%;
width: 70%;
height: 1px;
height: 1px;
margin: 0 auto;
margin: 0 auto;
background-image: linear-gradient(-90deg, rgba(255,255,255,0.00) 0%, #D0D0D0 52%, rgba(255,255,255,0.00) 100%);
background-image: linear-gradient(-90deg, rgba(255,255,255,0.00) 0%, #D0D0D0 52%, rgba(255,255,255,0.00) 100%);
}
}
.footer a {
.footer a {
padding-left: 10px;
padding-left: 10px;
transition: all 0.5s;
transition: all 0.5s;
}
}
.footer a:hover {
.footer a:hover {
color: #00c680;
color: #00c680;
transition: all 0.5s;
transition: all 0.5s;
}
}
@media only screen and (min-width:100px) and (max-width:1100px) {
@media only screen and (min-width:100px) and (max-width:1100px) {
复制
已复制
复制
已复制
.friend-link{
width:62%;
}
.header-img {
.header-img {
display: none
display: none
}
}
.header-nav {
.header-nav {
复制
已复制
复制
已复制
z-index:
99
;
z-index:
1
;
}
}
body {
body {
min-width: 320px;
min-width: 320px;
}
}
复制
已复制
复制
已复制
.mobile-menu,
.mobile-menu,
.mobile-menu2 {
.mobile-menu2 {
display: block;
display: block;
cursor: pointer
cursor: pointer
}
}
复制
已复制
复制
已复制
.header-bottom {
.header-bottom {
display: none;
display: none;
}
}
.main-bg {
.main-bg {
复制
已复制
复制
已复制
top:
5
0px;
top:
6
0px;
min-width: 320px;
min-width: 320px;
width: 100%;
width: 100%;
}
}
.main{
.main{
复制
已复制
复制
已复制
width:
100
%;
width:
90
%;
padding: 0;
padding: 0;
}
}
.footer {
.footer {
min-width: 320px;
min-width: 320px;
}
}
.logo {
.logo {
margin: 7px auto 11px;
margin: 7px auto 11px;
float: none;
float: none;
}
}
复制
已复制
复制
已复制
.logo-font {
display: none;
}
.sidebar {
.sidebar {
display: none;
display: none;
}
}
复制
已复制
复制
已复制
.right-side {
margin-left: 0;
}
.main-right {
.main-right {
float:none;
float:none;
width: 100%;
width: 100%;
padding: 0 10px;
padding: 0 10px;
box-sizing: border-box;
box-sizing: border-box;
}
}
.tag-web {
.tag-web {
复制
已复制
复制
已复制
overflow: hidden;
/*
overflow: hidden;
*/
}
}
.tag-web li {
.tag-web li {
width: 100%;
width: 100%;
复制
已复制
复制
已复制
margin: 10px 0;
/*
margin: 10px 0;
*/
margin-bottom: 30px;
box-sizing: border-box;
box-sizing: border-box;
}
}
.logo-btn {
.logo-btn {
复制
已复制
复制
已复制
width: 161px;
width: 161px;
height: 32px;
height: 32px;
display: block;
display: block;
margin: auto;
margin: auto;
}
}
.tag-web li a[href]{
.tag-web li a[href]{
width: 100%;
width: 100%;
height:147px;
height:147px;
padding: 25px;
padding: 25px;
box-sizing: border-box;
box-sizing: border-box;
}
}
.web-name {
.web-name {
width: calc(100% - 65px);
width: calc(100% - 65px);
}
}
复制
已复制
复制
已复制
.designer .web-name {
height: 50px;
line-height: 50px;
}
.header-left {
.header-left {
float: none;
float: none;
position: relative;
position: relative;
left: 50%;
left: 50%;
margin-left: -108px
margin-left: -108px
}
}
复制
已复制
复制
已复制
.ui {
margin: 20px auto;
float: none;
width: 90%;
text-align: center;
}
.friend-link {
display: none;
}
.footer {
float: none;
margin: 80px auto 0px;
width: 80%;
line-height: 1.8rem;
padding: 20px 0;
}
.footer a {
.footer a {
display: none;
display: none;
}
}
复制
已复制
复制
已复制
}
/*@media only screen and (min-width:1280px) and (max-width: 1365px) {
}
@media only screen and (min-width:1101px) and (max-width: 1279px) {
}*/
/*
@media only screen and (min-width:1100px) and (max-width: 1365px) {
.tag-web li {
width: 164px;
}
.tag-web li a[href] {
width: 134px;
}
.tag-web{
min-width: 920px;
}
.cate-title{
width:920px;
}
}
*/
@media only screen and (min-width:1100px) {
.tag-web{
min-width: 1100px
}
.cate-title{
width: 1078px
}
.main-sidebar{
display: block;
}
}
}
已保存差异
原始文本
打开文件
@charset "utf-8"; /* 高亮颜色 #00c680 */ * { margin: 0; padding: 0; border: 0; } html, body { height: 100%; -moz-user-select: none; -o-user-select:none; -khtml-user-select:none; -webkit-user-select:none; -ms-user-select:none; user-select:none;/**禁止选中文字*/ } input:focus, a:focus { outline: none; } body { font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif; font-weight: 200; background-color: #FBFBFB; min-width: 1100px; } a { text-decoration: none; } a[href] { color: #B0B0B0; } a[href]:active { color: #828689; boder: none; } .img-responsive { width: 100%; height: auto; display: block; border: none; } .logo { width: 161px; height: 32px; float: left; margin: 7px 10px 11px 18px; } .logo i { font-size: 32px; color: #FFF; transition: all 1s linear; } .logo:hover i { color: #00c680; transition: all 0.5s linear; } .header { width: 100%; } /* 导航栏 */ /* header-nav */ .header-nav { width: 100%; height: 50px; position: fixed; top: 0px; left: 0px; z-index: 999; background-color: #1E1D23; -webkit-box-sizing: border-box; } .logo-btn { width: 161px; height: 32px; display: block; } /* 左侧功能 */ .nav-left { float: left; margin-left: 33px; margin-top: 12px; display: none; } .nav-left a, .nav-right a { color: #FFF !important; font-size: 14px; display: block; float:left; padding: 6.5px 15px; } /* 右侧登陆注册 */ .nav-right { float: right; margin-top: 19px; margin-right: 20px; display: none; } .nav-right a { float: left; padding: 0px 10px; } .login { padding-right: 9px !important; border-right: 1px solid #fff; } .nav-right input { float:left; border: none; height: 16.5px; width: 30px; margin-right: 35px; display: none; } /* 返回按钮 */ .raturn { width: 730px; height: 20px; margin: 0px auto; } .raturn i { height: 20px; font-size: 20px; display: inline-block; color: #BDBDBD; float: left; } .raturn a { width: 54px; height: 20px; display: block; float: left; } .raturn span { font-size: 12px !important; margin-left: 5px; display: inline-block; height: 20px; line-height: 23px; float: left; } .raturn a:hover span { color: #44545E; } .raturn a:hover i { color: #44545E; } /* footer */ .footer { width: 100%; min-width: 1100px; height: 55px; margin-top: 30px; text-align: center; color: #B0B0B0; font-size: 12px; line-height: 55px; font-weight: 300; float: left; cursor: default; z-index: 12; } .footer-border { width: 70%; height: 1px; margin: 0 auto; background-image: linear-gradient(-90deg, rgba(255,255,255,0.00) 0%, #D0D0D0 52%, rgba(255,255,255,0.00) 100%); } .footer a { padding-left: 10px; transition: all 0.5s; } .footer a:hover { color: #00c680; transition: all 0.5s; } @media only screen and (min-width:100px) and (max-width:1100px) { .header-img { display: none } .header-nav { z-index: 99; } body { min-width: 320px; } .mobile-menu, .mobile-menu2 { display: block; cursor: pointer } .header-bottom { display: none; } .main-bg { top: 50px; min-width: 320px; width: 100%; } .main{ width: 100%; padding: 0; } .footer { min-width: 320px; } .logo { margin: 7px auto 11px; float: none; } .sidebar { display: none; } .main-right { float:none; width: 100%; padding: 0 10px; box-sizing: border-box; } .tag-web { overflow: hidden; } .tag-web li { width: 100%; margin: 10px 0; box-sizing: border-box; } .logo-btn { width: 161px; height: 32px; display: block; margin: auto; } .tag-web li a[href]{ width: 100%; height:147px; padding: 25px; box-sizing: border-box; } .web-name { width: calc(100% - 65px); } .header-left { float: none; position: relative; left: 50%; margin-left: -108px } .footer a { display: none; } }
更改后文本
打开文件
@charset "utf-8"; * { margin: 0; padding: 0; border: 0; } html, body { height: 100%; -moz-user-select: none; -o-user-select:none; -khtml-user-select:none; -webkit-user-select:none; -ms-user-select:none; user-select:none; } input:focus, a:focus { outline: none; } body { font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif; font-weight: 200; background-color: #FBFBFB; min-width: 1100px; } a { text-decoration: none; } a[href] { color: #B0B0B0; } a[href]:active { color: #828689; boder: none; } .fl{ float:left; } .fr{ float:right; } .img-responsive { width: 100%; height: auto; display: block; border: none; } .logo { font-size: 32px; color: #FFF; background: url(../images/logo.png) no-repeat; width: 60px; height: 32px; float: left; margin: 7px 10px 11px 18px; } .logo-font { padding: 13px 0; } .logo-font p, .logo-font span { font-size: 13px; color: #fff; line-height: 0.6; } .header { width: 100%; } .header-nav { width: 100%; height: 50px; position: fixed; top: 0px; left: 0px; z-index: 999; background-color: rgb(45, 45, 45);; -webkit-box-sizing: border-box; } .logo-btn { width: 161px; height: 32px; display: inline; } .nav-left { float: left; margin-left: 33px; margin-top: 12px; display: none; } .nav-left a, .nav-right a { color: #FFF !important; font-size: 14px; display: block; float:left; padding: 6.5px 15px; } .nav-right { float: right; margin-top: 19px; margin-right: 20px; display: none; } .nav-right a { float: left; padding: 0px 10px; } .login { padding-right: 9px !important; border-right: 1px solid #fff; } .nav-right input { float:left; border: none; height: 16.5px; width: 30px; margin-right: 35px; display: none; } .raturn { width: 730px; height: 20px; margin: 0px auto; } .raturn i { height: 20px; font-size: 20px; display: inline-block; color: #BDBDBD; float: left; } .raturn a { width: 54px; height: 20px; display: block; float: left; } .raturn span { font-size: 12px !important; margin-left: 5px; display: inline-block; height: 20px; line-height: 23px; float: left; } .raturn a:hover span { color: #44545E; } .raturn a:hover i { color: #44545E; } .friend-link { width: 48%; margin-top: 160px !important; margin-left: auto; margin-right: auto; font-size:12px; color:#333333; letter-spacing:0px; } .friend-link p{ font-family:PingFangSC-Regular; font-size:12px; color:#a2a1a1; letter-spacing:0px; height:20px; line-height:20px; } .friend-link .flink-title{ color:#333333; } /* footer */ .footer { width: 100%; min-width: 1100px; height: 55px; margin-top: 50px; text-align: center; color: #B0B0B0; font-size: 12px; line-height: 55px; font-weight: 300; float: left; cursor: default; z-index: 12; } .footer-border { width: 70%; height: 1px; margin: 0 auto; background-image: linear-gradient(-90deg, rgba(255,255,255,0.00) 0%, #D0D0D0 52%, rgba(255,255,255,0.00) 100%); } .footer a { padding-left: 10px; transition: all 0.5s; } .footer a:hover { color: #00c680; transition: all 0.5s; } @media only screen and (min-width:100px) and (max-width:1100px) { .friend-link{ width:62%; } .header-img { display: none } .header-nav { z-index: 1; } body { min-width: 320px; } .mobile-menu, .mobile-menu2 { display: block; cursor: pointer } .header-bottom { display: none; } .main-bg { top: 60px; min-width: 320px; width: 100%; } .main{ width: 90%; padding: 0; } .footer { min-width: 320px; } .logo { margin: 7px auto 11px; float: none; } .logo-font { display: none; } .sidebar { display: none; } .right-side { margin-left: 0; } .main-right { float:none; width: 100%; padding: 0 10px; box-sizing: border-box; } .tag-web { /*overflow: hidden;*/ } .tag-web li { width: 100%; /*margin: 10px 0;*/ margin-bottom: 30px; box-sizing: border-box; } .logo-btn { width: 161px; height: 32px; display: block; margin: auto; } .tag-web li a[href]{ width: 100%; height:147px; padding: 25px; box-sizing: border-box; } .web-name { width: calc(100% - 65px); } .designer .web-name { height: 50px; line-height: 50px; } .header-left { float: none; position: relative; left: 50%; margin-left: -108px } .ui { margin: 20px auto; float: none; width: 90%; text-align: center; } .friend-link { display: none; } .footer { float: none; margin: 80px auto 0px; width: 80%; line-height: 1.8rem; padding: 20px 0; } .footer a { display: none; } } /*@media only screen and (min-width:1280px) and (max-width: 1365px) { } @media only screen and (min-width:1101px) and (max-width: 1279px) { }*/ /* @media only screen and (min-width:1100px) and (max-width: 1365px) { .tag-web li { width: 164px; } .tag-web li a[href] { width: 134px; } .tag-web{ min-width: 920px; } .cate-title{ width:920px; } } */ @media only screen and (min-width:1100px) { .tag-web{ min-width: 1100px } .cate-title{ width: 1078px } .main-sidebar{ display: block; } }
查找差异